ci: Run Python 3 version of nosetests

SpriteLink · Oct 16, 2023 · a17bffc · a17bffc
1 parent 0d2d440
commit a17bffc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -113,7 +113,7 @@ jobs:
         sudo nipap-passwd add -u unittest -p gottatest -f /etc/nipap/local_auth.db -n unittest
         sudo systemctl restart nipapd.service
         # add some data to the database that we can verify later
-        nosetests tests/upgrade-before.py
+        nosetests3 tests/upgrade-before.py
         # bump version so that we know we are upgrading beyond what is installed
         (echo -e 'Version 9999.9.9\n------------------\n * Test version for automatic upgrade test'; cat NEWS) > NEWS2
         mv NEWS2 NEWS

diff --git a/nipap/nipapd b/nipap/nipapd
@@ -210,6 +210,7 @@ if __name__ == '__main__':
         # need a+ to be able to read PID from file
         try:
             lf = open(cfg.get('nipapd', 'pid_file'), 'a+')
+            os.chmod(cfg.get('nipapd', 'pid_file'), 600)
             lf.seek(0)
         except IOError as exc:
             logger.error("Unable to open PID file '" + str(exc.filename) + "': " + str(exc.strerror))

diff --git a/nipap/setup.py b/nipap/setup.py
@@ -19,22 +19,22 @@ def get_data_files():
         sys.exit(1)
 
     files = [
-        ('/etc/nipap/', ['nipap.conf.dist']),
-        ('/usr/sbin/', ['nipapd', 'nipap-passwd']),
-        ('/usr/share/nipap/sql/', [
-            'sql/upgrade-1-2.plsql',
-            'sql/upgrade-2-3.plsql',
-            'sql/upgrade-3-4.plsql',
-            'sql/upgrade-4-5.plsql',
-            'sql/upgrade-5-6.plsql',
-            'sql/upgrade-6-7.plsql',
-            'sql/functions.plsql',
-            'sql/triggers.plsql',
-            'sql/ip_net.plsql',
-        ],
-         ),
-        ('/usr/share/man/man8/', ['nipapd.8']),
-        ('/usr/share/man/man1/', ['nipap-passwd.1']),
+#        ('/etc/nipap/', ['nipap.conf.dist']),
+#        ('/usr/sbin/', ['nipapd', 'nipap-passwd']),
+#        ('/usr/share/nipap/sql/', [
+#            'sql/upgrade-1-2.plsql',
+#            'sql/upgrade-2-3.plsql',
+#            'sql/upgrade-3-4.plsql',
+#            'sql/upgrade-4-5.plsql',
+#            'sql/upgrade-5-6.plsql',
+#            'sql/upgrade-6-7.plsql',
+#            'sql/functions.plsql',
+#            'sql/triggers.plsql',
+#            'sql/ip_net.plsql',
+#        ],
+#         ),
+#        ('/usr/share/man/man8/', ['nipapd.8']),
+#        ('/usr/share/man/man1/', ['nipap-passwd.1']),
     ]
 
     return files