Skip to content

Commit a389f3f

Browse files
author
Harsh
committed
Fixed some bugs and spurious dependencies
- Added requirements.txt - Now codebase is working fine with Python 3.6+
1 parent 5ac7b18 commit a389f3f

9 files changed

+52
-13
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Byte-compiled / optimized / DLL files
2+
venv/
3+
.idea/
4+
25
__pycache__/
36
*.py[cod]
47
*$py.class

config.py

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
'''
2+
Configuration Settings
3+
'''
4+
import compat
5+
import os
6+
import json
7+
settings = None
8+
9+
def load_settings():
10+
global settings
11+
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'settings.json')) as f:
12+
settings = json.load(f)
13+
14+
def update_settings(key, val):
15+
global settings
16+
load_settings()
17+
settings[key] = val
18+
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'settings.json'), 'w') as f:
19+
json.dump(settings, f, indent=4)
20+
21+
def get_setting(key):
22+
global settings
23+
load_settings()
24+
return settings[key]
25+
26+
load_settings()

discover.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# This file prints discovers all test cases and prints out their IDs.
2+
import compat
3+
from config import get_setting
24
import unittest
35
import argparse
46

@@ -27,7 +29,7 @@ def print_tests(self):
2729

2830
if __name__ == '__main__':
2931
parser = argparse.ArgumentParser()
30-
parser.add_argument('--testdir', dest='testdir', default='../tests/legacy', help='Directory to choose tests from')
32+
parser.add_argument('--testdir', dest='testdir', default=get_setting('StartDir'), help='Directory to choose tests from')
3133
options = parser.parse_args()
3234

3335
disc = Discover()

main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
except ImportError:
88
from tkinter import *
99

10-
from guitest.view import MainWindow
11-
from guitest.model import UnittestProject
10+
from view import MainWindow
11+
from model import UnittestProject
1212

1313

1414
def main_loop(Model=UnittestProject):

model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from datetime import datetime
2-
from guitest.events import EventSource
2+
from events import EventSource
33
import sys
44

55

requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Pygments==2.2.0
2+
tkreadonly==0.6.1

runner.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
except ImportError:
99
from queue import Queue, Empty # python 3.x
1010

11-
from guitest.events import EventSource
12-
from guitest.model import TestMethod
11+
from events import EventSource
12+
from model import TestMethod
1313
import pipes
1414

1515

settings.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"Host": "10.85.4.251",
3+
"Port": 8080,
4+
"StartDir" : "."
5+
}

view.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
from ttk import *
88
import tkMessageBox
99
import tkFileDialog as filedialog
10+
from tkreadonly import ReadOnlyText
1011
except ImportError:
1112
from tkinter import filedialog
1213
from tkinter import *
1314
from tkinter.font import *
1415
from tkinter.ttk import *
1516
from tkinter import messagebox as tkMessageBox
17+
from tkreadonly import ReadOnlyText
1618

17-
from tkreadonly import ReadOnlyText
18-
from guitest.model import TestMethod, TestCase, TestModule, ModelLoadError
19-
from guitest.runner import Runner
20-
from fs5test.utils.config import get_setting, update_settings, load_settings
19+
from model import TestMethod, TestCase, TestModule, ModelLoadError
20+
from runner import Runner
21+
from config import get_setting, update_settings
2122
import os
2223

2324

@@ -293,7 +294,7 @@ def _setup_right_frame(self):
293294

294295
self.testdir_name = StringVar()
295296
self.testdir_widget = Entry(self.details_frame, textvariable= self.testdir_name, width=40)
296-
self.testdir_name.set('../tests/legacy')
297+
self.testdir_name.set(get_setting('StartDir'))
297298
self.testdir_widget.grid(column=1, row=1, sticky=(W))
298299

299300
# Reload Tests Load Button.
@@ -499,7 +500,7 @@ def project(self, project):
499500
TestMethod.bind('status_update', self.on_nodeStatusUpdate)
500501

501502

502-
def reload_project(self, testdir='../tests/legacy'):
503+
def reload_project(self, testdir=get_setting('StartDir')):
503504
# If the directory does not exist, throw an error message and don't do anything.
504505
if os.path.exists(testdir) is False:
505506
dialog = tkMessageBox.showerror
@@ -512,7 +513,7 @@ def reload_project(self, testdir='../tests/legacy'):
512513
self.project = self.load_project(self.root, self.Model, testdir)
513514

514515

515-
def load_project(self, root, Model, testdir='../tests/legacy'):
516+
def load_project(self, root, Model, testdir=get_setting('StartDir')):
516517
self.Model = Model
517518
project = None
518519
while project is None:

0 commit comments

Comments
 (0)