Fix dhcp tests

allegro · Dec 13, 2024 · 712124a · 712124a
1 parent 22d9fa3
commit 712124a
Show file tree

Hide file tree

Showing 7 changed files with 587 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -262,10 +262,6 @@ jobs:
         run: |
           pip3 install -r "${GITHUB_WORKSPACE}/requirements/test.txt"
 
-      - name: Install PostgreSQL driver
-        if: ${{ matrix.db-engine == 'psql' }}
-        run: pip3 install psycopg2-binary
-
       - name: Test ralph_dchp_agent using python-${{ matrix.python-version }}
         run: python contrib/dhcp_agent/test.py
 

diff --git a/contrib/dhcp_agent/dhcp_agent.py b/contrib/dhcp_agent/dhcp_agent.py
@@ -14,17 +14,18 @@
 from logging import handlers as logging_handlers
 from optparse import OptionParser
 
-IS_PY3 = sys.version_info[0] == 3
-if IS_PY3:
+try:
     from dbm import gnu as cache_db
+except:  # noqa
+    import dbm as cache_db
+
+try:
     from urllib.error import HTTPError
     from urllib.parse import urlencode
     from urllib.request import Request, urlopen
     string_types = (str,)
-else:
-    import dbm as cache_db
+except:  # noqa
     from urllib import urlencode
-
     from urllib2 import HTTPError, Request, urlopen
     string_types = (basestring,)
 

diff --git a/src/ralph/dhcp/agent/__init__.py b/src/ralph/dhcp/agent/__init__.py