fixing some tests

This commit is contained in:
DJ2LS 2024-04-17 23:18:55 +02:00
parent 4b6d489cf0
commit ff002ec479
4 changed files with 12 additions and 7 deletions

View file

@ -53,7 +53,7 @@ Section "FreeData Server" SEC01
doneBackup: doneBackup:
; Add your application files here ; Add your application files here
File /r "modem\server.dist\*" File /r "freedata-server\server.dist\*"
; Restore the original "config.ini" if it was backed up ; Restore the original "config.ini" if it was backed up
IfFileExists $INSTDIR\freedata-server\config.ini.bak restoreConfig IfFileExists $INSTDIR\freedata-server\config.ini.bak restoreConfig
@ -93,7 +93,7 @@ Section "FreeData x64 GUI" SEC02
SetOutPath $INSTDIR\freedata-gui SetOutPath $INSTDIR\freedata-gui
; Add GUI files here ; Add GUI files here
File /r "gui\release\win-unpacked\*" File /r "freedata-gui\release\win-unpacked\*"
; Create a shortcut on the desktop for the GUI ; Create a shortcut on the desktop for the GUI
CreateShortCut "$DESKTOP\FreeDATA GUI.lnk" "$INSTDIR\freedata-gui\freedata.exe" CreateShortCut "$DESKTOP\FreeDATA GUI.lnk" "$INSTDIR\freedata-gui\freedata.exe"

View file

@ -101,7 +101,6 @@ else:
files = [] files = []
api = None api = None
print(files)
for file in files: for file in files:
try: try:
api = ctypes.CDLL(file) api = ctypes.CDLL(file)

View file

@ -101,8 +101,9 @@ class FrameHandler():
if "session_id" in frame: if "session_id" in frame:
activity["session_id"] = frame["session_id"] activity["session_id"] = frame["session_id"]
if "AWAY_FROM_KEY" in frame["flag"]: if "flag" in frame:
activity["away_from_key"] = frame["flag"]["AWAY_FROM_KEY"] if "AWAY_FROM_KEY" in frame["flag"]:
activity["away_from_key"] = frame["flag"]["AWAY_FROM_KEY"]
self.states.add_activity(activity) self.states.add_activity(activity)
@ -121,6 +122,11 @@ class FrameHandler():
distance_km = distance_dict['kilometers'] distance_km = distance_dict['kilometers']
distance_miles = distance_dict['miles'] distance_miles = distance_dict['miles']
away_from_key = False
if "flag" in self.details['frame']:
if "AWAY_FROM_KEY" in self.details['frame']["flag"]:
away_from_key = self.details['frame']["flag"]["AWAY_FROM_KEY"]
helpers.add_to_heard_stations( helpers.add_to_heard_stations(
frame['origin'], frame['origin'],
dxgrid, dxgrid,
@ -131,7 +137,7 @@ class FrameHandler():
self.states.heard_stations, self.states.heard_stations,
distance_km=distance_km, # Pass the kilometer distance distance_km=distance_km, # Pass the kilometer distance
distance_miles=distance_miles, # Pass the miles distance distance_miles=distance_miles, # Pass the miles distance
away_from_key=self.details['frame']["flag"]["AWAY_FROM_KEY"] away_from_key=away_from_key
) )
def make_event(self): def make_event(self):

View file

@ -1,3 +1,3 @@
npm test --prefix gui npm test --prefix freedata-gui
python -m unittest discover tests python -m unittest discover tests