Change travis to have pymongo

	modified:   .travis.yml
	modified:   libnmap/test/host_test.py
	modified:   libnmap/test/report_test.py

Author: bmx0r

.travis.yml

@@ -8,6 +8,7 @@ python:
 install:
   - "pip install pep8 --use-mirrors"
   - "pip install pyflakes --use-mirrors"
+  - "pip install pymongo --use-mirrors"
   - "python setup.py install"
 #   - "pip install -r requirements.txt --use-mirrors"
 #     # command to run tests

libnmap/test/host_test.py

@@ -173,31 +173,31 @@ def test_diff_host(self):
         self.assertEqual(c1.removed(), set([]))
 
         self.assertEqual(c1.unchanged(), set(['status',
-                                              'NmapService.343309847',
-                                              'NmapService.343309848',
-                                              'NmapService.343309921',
-                                              'NmapService.343309433',
+                                              "NmapService.('tcp', 22)",
+                                              "NmapService.('tcp', 111)",
+                                              "NmapService.('tcp', 631)",
+                                              "NmapService.('tcp', 3306)",
                                               'address',
-                                              'NmapService.343306980']))
+                                              "NmapService.('tcp', 25)"]))
 
         self.assertEqual(c2.changed(), set(['status',
-                                            'NmapService.343306980']))
-        self.assertEqual(c2.added(), set(['NmapService.343309847']))
-        self.assertEqual(c2.removed(), set(['NmapService.343306981']))
-        self.assertEqual(c2.unchanged(), set(['hostnames',
-                                              'NmapService.343309848',
-                                              'NmapService.343309921',
-                                              'NmapService.343309433',
+                                            'NmapService.(\'tcp\', 3306)']))
+        self.assertEqual(c2.added(), set(['NmapService.(\'tcp\', 25)']))
+        self.assertEqual(c2.removed(), set(['NmapService.(\'tcp\', 3307)']))
+        self.assertEqual(c2.unchanged(), set(["NmapService.('tcp', 631)",
+                                              'hostnames',
+                                              "NmapService.('tcp', 22)",
+                                              "NmapService.('tcp', 111)",
                                               'address']))
 
         self.assertEqual(c3.changed(), set(['status', 'hostnames',
-                                            'NmapService.343306980']))
-        self.assertEqual(c3.added(), set(['NmapService.343309847']))
-        self.assertEqual(c3.removed(), set(['NmapService.343306981']))
-        self.assertEqual(c3.unchanged(), set(['NmapService.343309848',
-                                              'NmapService.343309921',
-                                              'NmapService.343309433',
-                                              'address']))
+                                            "NmapService.('tcp', 3306)"]))
+        self.assertEqual(c3.added(), set(["NmapService.('tcp', 25)"]))
+        self.assertEqual(c3.removed(), set(["NmapService.('tcp', 3307)"]))
+        self.assertEqual(c3.unchanged(), set(["NmapService.('tcp', 631)",
+                                             "NmapService.('tcp', 22)",
+                                             "NmapService.('tcp', 111)",
+                                             'address']))
 
 
 if __name__ == '__main__':

libnmap/test/report_test.py

@@ -73,7 +73,8 @@ def test_report_constructor(self):
             self.assertEqual(len(nr.scanned_hosts), testfile['hosts'])
 
             self.assertEqual(len(nr2.scanned_hosts), testfile['hosts'])
-            self.assertEqual(sorted(nr2.get_raw_data()), sorted(nr.get_raw_data()))
+            self.assertEqual(sorted(nr2.get_raw_data()),
+                             sorted(nr.get_raw_data()))
 
     def test_get_ports(self):
         for testfile in self.flist:
@@ -210,13 +211,13 @@ def test_host_address_unchanged(self):
         self.assertEqual(h2.diff(h3).removed(), set([]))
         self.assertEqual(h2.diff(h3).unchanged(),
                          set(['status',
-                              'NmapService.343309847',
-                              'NmapService.343309848',
-                              'NmapService.343309921',
+                              "NmapService.('tcp', 22)",
+                              "NmapService.('tcp', 111)",
+                              "NmapService.('tcp', 631)",
                               'hostnames',
-                              'NmapService.343309433',
+                              "NmapService.('tcp', 3306)",
                               'address',
-                              'NmapService.343306980']))
+                              "NmapService.('tcp', 25)"]))
 
 if __name__ == '__main__':
     test_suite = ['test_report_constructor', 'test_get_ports',