From 220c123930e3438d16e5705fddde35f9c51ba7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Fri, 10 Aug 2018 23:45:43 +0200
Subject: [PATCH] chg: try xenial on travis

---
 .travis.yml | 51 +++++++++++++++++++++++----------------------------
 PyMISP      |  2 +-
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 545eed941..6fac134d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-    - 5.6
     - 7.0
     - 7.1
     - 7.2
@@ -11,42 +10,30 @@ services:
     - redis
 
 sudo: required
-dist: trusty
+dist: bionic
 group: edge
 
 addons:
-    mariadb:
-        - '10.0'
+    mariadb: '10.2'
     hosts:
         - misp.local
         - localhost
-    apt:
-        packages:
-            - python3-dev
-            - python3-pip
-            - python3-nose
-            - libxml2-dev
-            - libzmq3-dev
-            - zlib1g-dev
-            - apache2
-            - curl
-            - php5-mysql
-            - php5-dev
-            - php5-cli
-            - libapache2-mod-php5
-
 
 before_install:
     - git config --global user.name "TravisCI"
+    - export PATH="$HOME/.local/bin:$PATH"
 
 install:
     - sudo add-apt-repository -y ppa:deadsnakes/ppa
     - sudo apt-get -y update
-    - sudo apt-get -y install python3.6
-    - sudo aot-get -y dist-upgrade
-    - sudo pip3 install --upgrade pip setuptools requests
+    - sudo apt-get -y install python3.6 python3-pip python3.6-dev python3-nose libxml2-dev libzmq3-dev zlib1g-dev apache2 curl php-mysql php-dev php-cli libapache2-mod-php
+    - sudo apt-get -y dist-upgrade
+    - wget https://bootstrap.pypa.io/get-pip.py
+    - sudo python3.6 get-pip.py
     - hash -r
-    - pip3 install --user --upgrade -r requirements.txt
+    - sudo pip3.6 install --upgrade pip setuptools requests
+    - hash -r
+    - sudo pip3.6 install --upgrade -r requirements.txt
     - phpenv rehash
     - pushd app
     - composer install
@@ -74,6 +61,7 @@ install:
     - mysql -u misp -pblah misp < INSTALL/MYSQL.sql
     # configure apache virtual hosts
     - sudo chmod -R 777 `pwd`/build
+    - sudo mkdir -p /etc/apache2/sites-available
     - sudo cp -f build/travis-ci-apache /etc/apache2/sites-available/misp.local.conf
     - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/misp.local.conf
     - sudo a2dissite 000-default
@@ -99,6 +87,7 @@ install:
     # Get authkey
     - sudo usermod -a -G www-data $USER
     - sudo -E su $USER -c 'app/Console/cake userInit -q | sudo tee ./key.txt'
+    - sudo app/Console/cake Live 1
     - sudo chmod 777 ./key.txt
     - sudo chmod -R 777 ./tests
     - sudo chown -R www-data:www-data `pwd`
@@ -121,14 +110,20 @@ script:
     - ./curl_tests.sh $AUTH
     - popd
     - pushd PyMISP
-    - pip3 install --user .
-    - nosetests --with-coverage --cover-package=pymisp tests/test_*.py
-    - python3 tests/test.py
-    - python3 tests/testlive*.py
+    - sudo pip3.6 install nose python-dateutil
+    - sudo pip3.6 install git+https://github.com/kbandla/pydeep.git
+    - sudo pip3.6 install -e .[fileobjects,neo,openioc,virustotal]
+    - pushd tests
+    - git clone https://github.com/viper-framework/viper-test-files.git
+    - popd
+    - python3.6 tests/test.py
+    - python3.6 tests/test_mispevent.py
+    - python3.6 tests/test_offline.py
+    - python3.6 tests/testlive_comprehensive.py
     - popd
     - cp PyMISP/tests/keys.py PyMISP/examples/events/
     - pushd PyMISP/examples/events/
-    - python3 ./create_massive_dummy_events.py -l 5 -a 30
+    - python3.6 ./create_massive_dummy_events.py -l 5 -a 30
     - popd
     - pushd app/files/feed-metadata
     - jsonschema -i defaults.json schema.json
diff --git a/PyMISP b/PyMISP
index f0ead7227..9669d892c 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit f0ead72278a44928644a285cf1c34b5cdcb03378
+Subproject commit 9669d892c5e2fb19db245ddda74db1ee21c78229