[skip ci] Fix conflicts with TheNodi PR

Author: cpriego

.travis.yml

@@ -22,67 +22,66 @@ matrix:
     #     phpunit: false
     #     distro: arch
     #     run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-    # - php: 7.0
-    #   env:
-    #     phpunit: false
-    #     distro: centos7
-    #     run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-    # - php: 7.0
-    #   env:
-    #     phpunit: false
-    #     distro: fedora24
-    #     run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-    # - php: 7.0
-    #   env:
-    #     phpunit: false
-    #     distro: fedora25
-    #     run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-    # - php: 7.0
-    #   env:
-    #     phpunit: false
-    #     distro: ubuntu1604
-    #     run_opts: ""
-    # - php: 7.0
-    #   env:
-    #     phpunit: false
-    #     distro: ubuntu1404
-    #     run_opts: ""
-  # allow_failures:
-  #   - php: 7.1
-  #     env:
-  #       phpunit: false
-  #       distro: arch
-  #       run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-  #   - php: 7.0
-  #     env:
-  #       phpunit: false
-  #       distro: centos7
-  #       run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-  #   - php: 7.0
-  #     env:
-  #       phpunit: false
-  #       distro: fedora24
-  #       run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-  #   - php: 7.0
-  #     env:
-  #       phpunit: false
-  #       distro: fedora25
-  #       run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
-  #   - php: 7.0
-  #     env:
-  #       phpunit: false
-  #       distro: ubuntu1604
-  #       run_opts: ""
-  #   - php: 7.0
-  #     env:
-  #       phpunit: false
-  #       distro: ubuntu1404
-  #       run_opts: ""
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: centos7
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: fedora24
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: fedora25
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: ubuntu1604
+        run_opts: ""
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: ubuntu1404
+        run_opts: ""
+  allow_failures:
+    - php: 7.1
+      env:
+        phpunit: false
+        distro: arch
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: centos7
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: fedora24
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: fedora25
+        run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: ubuntu1604
+        run_opts: ""
+    - php: 7.0
+      env:
+        phpunit: false
+        distro: ubuntu1404
+        run_opts: ""
 
 before_install:
   - travis_retry composer self-update
-  # - git clone --depth=50 https://github.com/TheNodi/docker-valet-test-images.git $HOME/vdock
-  # - if [[ -n $distro ]]; then travis_retry docker build -t thenodi/docker-${distro}-valet:latest $HOME/vdock/$distro; fi
+  - if [[ -n $distro ]]; then travis_retry docker pull thenodi/docker-${distro}-valet:latest; fi
 
 cache:
   directories:
@@ -97,19 +96,19 @@ script:
   - if [[ $phpunit = true ]]; then vendor/bin/phpunit; fi
 
   # Start the container in detached mode
-  # - >
-  #   if [[ -n $distro ]]; then
-  #     CONTAINER_ID=$( \
-  #         docker run --detach \
-  #             --volume="${PWD}":/workspace \
-  #             -e "REPOSITORY=/workspace" \
-  #             ${run_opts} \
-  #             thenodi/docker-${distro}-valet:latest
-  #     );
-  #   fi
+  - >
+    if [[ -n $distro ]]; then
+      CONTAINER_ID=$( \
+          docker run --detach \
+              --volume="${PWD}":/workspace \
+              -e "REPOSITORY=/workspace" \
+              ${run_opts} \
+              thenodi/docker-${distro}-valet:latest
+      );
+    fi
 
   # Prepare the container
-  # - if [[ -n $distro ]]; then docker exec -it $CONTAINER_ID /prepare.sh; fi
+  - if [[ -n $distro ]]; then docker exec -it $CONTAINER_ID /prepare.sh; fi
 
   # Run functional tests
-  # - if [[ -n $distro ]]; then docker exec -it -u valet $CONTAINER_ID /workspace/tests/Functional/run.sh; fi
+  - if [[ -n $distro ]]; then docker exec -it -u valet $CONTAINER_ID /workspace/tests/Acceptance/docker.sh; fi

tests/Functional/run.sh

@@ -12,22 +12,8 @@ fi
 # Go into repository workspace
 cd $REPOSITORY
 
-if [[ "${APP_ENV}" = "testing" ]]; then
-    touch in_testing
-
-    if [[ ! -d '/run/resolvconf/interfaces/' ]]
-        sudo mkdir -p '/run/resolvconf/interfaces/'
-    fi
-
-    $NPATH="/run/resolvconf/interfaces/NetworkManager"
-    $DMPATH="/workspace/cli/stubs/dnsmasq.conf"
-
-    grep -pb "nameserver" "${NPATH}" || echo 'nameserver 8.8.8.8' | sudo tee -a "${NPATH}" > /dev/null
-    grep -pb "user=root" "${DMPATH}" || echo 'user=root' | sudo tee -a "${DMPATH}" > /dev/null
-fi
-
 # Install valet
 ./valet install
 
 # Run Functional tests
-vendor/bin/phpunit --group functional
+vendor/bin/phpunit --group functional --exclude-group none