BUG: psql_initdb: fix function call

Signed-off-by: Sebastian Wagner <sebix@sebix.at>
certtools · Oct 13, 2016 · 7ae6042 · 7ae6042
1 parent 3f2e494
commit 7ae6042
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/intelmq/bin/intelmq_psql_initdb.py b/intelmq/bin/intelmq_psql_initdb.py
@@ -16,7 +16,7 @@
 from intelmq import HARMONIZATION_CONF_FILE
 
 
-def main():
+def generate():
     FIELDS = dict()
 
     try:
@@ -67,7 +67,7 @@ def main():
     return initdb
 
 
-if __name__ == '__main__':
+def main():
     OUTPUTFILE = "/tmp/initdb.sql"
     fp = None
     try:
@@ -78,9 +78,13 @@ def main():
             fp = os.fdopen(os_fp, 'wt')
         else:
             fp = open(OUTPUTFILE, 'wt')
-        psql = main()
+        psql = generate()
         print("INFO - Writing %s file" % OUTPUTFILE)
         fp.write(psql)
     finally:
         if fp:
             fp.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/intelmq/tests/bin/test_psql_initdb.py b/intelmq/tests/bin/test_psql_initdb.py
@@ -20,7 +20,7 @@ def test_output(self):
         with open(os.path.join(os.path.dirname(__file__),
                                'initdb.sql')) as handle:
             expected = handle.read()
-        self.assertEqual(psql_initd.main().strip(), expected.strip())
+        self.assertEqual(psql_initd.generate().strip(), expected.strip())
 
 
 if __name__ == '__main__':