Merge remote-tracking branch 'upstream/master'

Dockerfile

@@ -7,7 +7,7 @@ RUN sed -i -e 's/main/main non-free contrib/g' /etc/apt/sources.list
 
 # Install dependencies
 RUN apt-get update -y -qq && apt-get install -y -qq \
-        libmysqlclient-dev \
+        default-libmysqlclient-dev \
         libxslt1-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

conpot/tests/test_ext_ip_util.py

@@ -21,7 +21,7 @@
 import unittest
 import conpot.utils.ext_ip
 
-from gevent.wsgi import WSGIServer
+from gevent.pywsgi import WSGIServer
 import gevent
 
 

conpot/tests/test_logger_mysql.py

@@ -22,6 +22,7 @@
 
 
 class Test_MySQLlogger(unittest.TestCase):
+    @unittest.skip
     def test_mysqllogger(self):
         """
         Objective: Test if events can be stored to and retrieved from mysql properly.
@@ -52,4 +53,4 @@ def test_mysqllogger(self):
 
         # now that we logged something, lets try to retrieve the event again..
         retrieved_event = mysqllogger.select_session_data(test_event['id'])
-        self.assertEqual(len(retrieved_event), 1, 'Retrieved wrong number of events (or no event at all)')
+        self.assertEqual(len(retrieved_event), 1, 'Retrieved wrong number of events (or no event at all)')

conpot/tests/test_mac_addr.py

@@ -27,7 +27,8 @@ def setUp(self):
 
     def tearDown(self):
         pass
-
+
+    @unittest.skip
     def test_mac(self):
         """
         Objective: Test if the spoofer is able to change MAC address

requirements.txt

@@ -24,3 +24,4 @@ pyghmi
 mixbox
 modbus-tk
 cpppo
+pycrypto