Fix broken Travis tests - get test setup from mod-livestatus

Scheduler broks is an array not a dict

Author: mohierf

.travis.yml

@@ -1,21 +1,23 @@
 language: python
 python:
   - "2.7"
-  - "2.6"
 
 install:
+  - sudo apt-get update && sudo apt-get install -y python-pip libgnutls28-dev libssl-dev
+  # python-pycurl python-cherrypy3
   - ./test/setup_module_test.sh
   - pip install importlib # this is a requirement of shinken
-  - export PYTHONPATH=$PYTHONPATH:~/shinken # we need shinken..
-  - export PYTHONPATH=$PYTHONPATH:~/shinken/test
-  - export PYTHONPATH=$PYTHONPATH:~/mod-livestatus/test # we also need mock_livestatus from mod-livestatus..
 
 script:
-  - mongodir=$(pwd)
-  # tests need to run from shinken test directory for access to test config files
-  #  (as long as the test config files are referenced with a relative path)
-  - cd ~/shinken/test
-  - nosetests -vx --with-coverage --cover-package=modules $mongodir/test
+  - cur_dir=$PWD
+  - export PYTHONPATH=$PYTHONPATH:$PWD/test/tmp/shinken # we need shinken..
+#  - export PYTHONPATH=$PYTHONPATH:$PWD/test/tmp/shinken/test
+#  - export PYTHONPATH=$PYTHONPATH:$PWD/test/tmp/shinken/test/modules
+  - export PYTHONPATH=$PYTHONPATH:$PWD/test/tmp/shinken/test/modules/livestatus # we also need mock_livestatus from mod-livestatus..
+  - echo $PYTHONPATH
+  - cd test/tmp/shinken/test
+  - nosetests -vx --process-restartworker  --processes=1 --process-timeout=1800 "$cur_dir/test"
+  - coverage combine
 
 after_success:
   coveralls

test/requirements.txt

@@ -1,2 +1,3 @@
 -r ../requirements.txt
 unittest2
+coveralls

test/setup_module_test.sh

@@ -1,35 +1,84 @@
 #!/bin/bash
 
+set -e
+set -xv
+
+py_version_short=$(python -c "import sys; print(''.join(str(x) for x in sys.version_info[:2]))")
+# -> 26 or 27 or 34 or ..
+
 get_name (){
     echo $(python -c 'import json; print json.load(open("'$1'package.json"))["name"]')
 }
 
+SHI_DST=test/tmp/shinken
+
 setup_submodule (){
+    local dep
+    local mname
+    local mpath
     for dep in $(cat test/dep_modules.txt); do
         mname=$(basename $dep | sed 's/.git//g')
-        git clone --depth=15 $dep ~/$mname
-        rmname=$(get_name ~/$mname/)
-        cp -r  ~/$mname/module ~/shinken/modules/$rmname
-        [ -f ~/$mname/requirements.txt ] && pip install -r ~/$mname/requirements.txt
+        mpath="test/tmp/$mname"
+        git clone --depth 10 "$dep" "$mpath"
+        ( cd $mpath && git status && git log -1)
+        rmname=$(get_name "$mpath/")
+        ln -s "$PWD/$mpath/module" "$PWD/$SHI_DST/test/modules/$rmname"
+
+        if [ -f "$PWD/$mpath/test/mock_livestatus.py" ]
+        then
+            ln -s "$PWD/$mpath/test/mock_livestatus.py" "$PWD/$SHI_DST/test/modules/$rmname/mock_livestatus.py"
+        fi
+
+        if [ -f "$PWD/$mpath/test/etc" ]
+        then
+            cp -r "$PWD/$mpath/test/etc" "$PWD/$SHI_DST/test/etc"
+        fi
+
+        if [ -f "$mpath/requirements.txt" ]
+        then
+            pip install -r "$mpath/requirements.txt"
+        fi
+
+        ls -alH "$PWD/$SHI_DST/test/modules/$rmname"
     done
-    # we need the livestatus test config files to be in shinken test config dir:
-    cp -r ~/mod-livestatus/test/etc/* ~/shinken/test/etc/
 }
 
 name=$(get_name)
 
 pip install pycurl
 pip install coveralls
-git clone https://github.com/naparuba/shinken.git ~/shinken
 
-[ -f test/dep_modules.txt ] && setup_submodule
-[ -f requirements.txt ] && pip install -r requirements.txt
-[ -f test/requirements.txt ] && pip install -r test/requirements.txt
+rm -rf test/tmp
+mkdir -p test/tmp/
+
+git clone --depth 10 https://github.com/naparuba/shinken.git "$SHI_DST"
+( cd "$SHI_DST" && git status && git log -1)
+
+spec_requirement="requirements-${py_version_short}.txt"
+
+(
+    cd "$SHI_DST"
+    pip install -r test/requirements.txt
+    if [ -f "test/${spec_requirement}" ]
+    then
+        pip install -r "test/${spec_requirement}"
+    fi
+)
+
+if [ -f test/dep_modules.txt ]
+then
+    setup_submodule
+fi
 
-# if we have test config files we probably also need them in the shinken/test directory :
-[ -d test/etc ] && cp -r test/etc ~/shinken/test/
+test_requirement="test/requirements.txt"
+if [ -f "$test_requirement" ]
+then
+    pip install -r "$test_requirement"
+fi
+test_requirement="test/$spec_requirement"
+if [ -f "$test_requirement" ]
+then
+    pip install -r "$test_requirement"
+fi
 
-# copy our module package to the shinken modules directory:
-cp -r module ~/shinken/modules/$name
-# and make a link to it from the test/modules directory:
-ln -sf ~/shinken/modules/ ~/shinken/test/modules
+ln -s "$PWD/module" "$SHI_DST/test/modules/$name"

test/test_livestatus_mongodb.py

@@ -141,7 +141,6 @@ def tearDownClass(cls):
         mp.wait()
         os.system('/bin/rm -rf %r' % cls._mongo_tmp_path)
 
-
     def tearDown(self):
         self.livestatus_broker.db.commit()
         self.livestatus_broker.db.close()
@@ -162,7 +161,6 @@ def tearDown(self):
         self.livestatus_broker = None
 
 
-
 @mock_livestatus_handle_request
 class TestConfigSmall(TestConfig):
     def setUp(self):
@@ -549,9 +547,8 @@ def test_max_logs_age(self):
         self.assertEqual(7*365, livestatus_broker.max_logs_age)
 
 
-
 if __name__ == '__main__':
-    #import cProfile
+    # import cProfile
     command = """unittest.main()"""
     unittest.main()
-    #cProfile.runctx( command, globals(), locals(), filename="/tmp/livestatus.profile" )
+    # cProfile.runctx( command, globals(), locals(), filename="/tmp/livestatus.profile" )