WIP packaging

Author: JannisBush

_hp/hp/tools/crawler/test_receiver.py renamed to _hp/hp/tools/crawler/demo_receiver.py

@@ -3,13 +3,8 @@
 import json
 
 # Setup the config
-try:
-    proj_config = json.load(open("config.json"))
-except OSError:
-    try:
-        proj_config = json.load(open("_hp/tools/config.json"))
-    except OSError:
-        proj_config = json.load(open("../config.json"))
+
+proj_config = json.load(open("_hp/hp/tools/config.json"))
 
 DB_URL = proj_config['DB_URL'].replace("postgresql+psycopg2://", "postgresql://")
 

_hp/hp/tools/crawler/desktop_selenium.py

@@ -8,8 +8,8 @@
 import time
 
 from tqdm import tqdm
-from utils import TIMEOUT, generate_short_uuid, get_tests, HSTS_DEACTIVATE, create_test_page_runner
-from create_browsers import get_or_create_browser
+from hp.tools.crawler.utils import TIMEOUT, generate_short_uuid, get_tests, HSTS_DEACTIVATE, create_test_page_runner
+from hp.tools.create_browsers import get_or_create_browser
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
@@ -20,7 +20,7 @@
 import argparse
 import json
 from pathlib import Path
-from Timeout import SignalTimeout
+from hp.tools.crawler.Timeout import SignalTimeout
 import logging
 import ecs_logging
 import psutil

_hp/hp/tools/crawler/selenium_test_specific.py renamed to _hp/hp/tools/crawler/selenium_run_specific.py

@@ -1,10 +1,10 @@
-from utils import TIMEOUT, generate_short_uuid, get_tests, HSTS_DEACTIVATE, create_test_page_runner
+from hp.tools.crawler.utils import TIMEOUT, generate_short_uuid, get_tests, HSTS_DEACTIVATE, create_test_page_runner
 
-from create_browsers import get_or_create_browser
+from hp.tools.create_browsers import get_or_create_browser
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
-from desktop_selenium import get_browser
+from hp.tools.crawler.desktop_selenium import get_browser
 
 
 config = [

_hp/hp/tools/crawler/test_internals.py

@@ -2,8 +2,8 @@
 
 #from wpt._hp.tools.crawler.utils import generate_short_uuid
 #from utils import generate_short_uuid
-from selenium_test_specific import config, run_specific
-from tools.crawler.utils import generate_short_uuid
+from hp.tools.crawler.selenium_run_specific import config, run_specific
+from hp.tools.crawler.utils import generate_short_uuid
 
 def test_generate_short_uuid():
     assert len(generate_short_uuid(3)) == 3

_hp/hp/tools/crawler/utils.py

@@ -5,15 +5,8 @@
 from sqlalchemy import ClauseElement
 from sqlalchemy.exc import IntegrityError
 
-try:
-    from models import Session, Browser
-except:
-    import sys
-    from pathlib import Path
-    file = Path(__file__).resolve()
-    parent, root = file.parent, file.parents[1]
-    sys.path.append(str(root))
-    from models import Session, Browser
+from hp.tools.models import Session, Browser
+
 
 
 # Time until all tests on a page have to be finished (called done())

_hp/hp/tools/create_browsers.py

@@ -1 +1 @@
-from crawler.utils import get_or_create_browser
+from hp.tools.crawler.utils import get_or_create_browser

_hp/hp/tools/models.py

@@ -10,13 +10,7 @@
 
 
 # Setup the config
-try:
-    proj_config = json.load(open("config.json"))
-except OSError:
-    try:
-        proj_config = json.load(open("_hp/tools/config.json"))
-    except OSError:
-        proj_config = json.load(open("../config.json"))
+proj_config = json.load(open("_hp/hp/tools/config.json"))
 
 DB_URL = proj_config['DB_URL']