Bugfix/tests

test/tests/integration/bad-extensions.bats

@@ -1,4 +1,4 @@
-# Integration test for a simple go app
+# Integration test for a simple php app
 
 # source environment helpers
 . util/env.sh

test/tests/integration/composer.bats

@@ -1,4 +1,4 @@
-# Integration test for a simple go app
+# Integration test for a simple php app
 
 # source environment helpers
 . util/env.sh

test/tests/integration/extensions.bats

@@ -1,4 +1,4 @@
-# Integration test for a simple go app
+# Integration test for a simple php app
 
 # source environment helpers
 . util/env.sh

test/tests/integration/phpinfo-php-5.3.bats → test/tests/integration/phpinfo-apache2.2-fpm-php5.3.bats

@@ -1,4 +1,4 @@
-# Integration test for a simple go app
+# Integration test for a simple php app
 
 # source environment helpers
 . util/env.sh
@@ -12,7 +12,7 @@ payload() {
   "cache_dir": "/tmp/cache",
   "etc_dir": "/data/etc",
   "env_dir": "/data/etc/env.d",
-  "config": { "runtime": "php-5.3", "extensions": ["amqp", "dom", "timezonedb"] }
+  "config": { "runtime": "php-5.3", "extensions": ["amqp", "dom", "timezonedb"], "apache_version": "2.2" }
 }
 END
 }

test/tests/integration/phpinfo-php-5.4.bats → test/tests/integration/phpinfo-apache2.2-fpm-php5.4.bats

@@ -1,4 +1,4 @@
-# Integration test for a simple go app
+# Integration test for a simple php app
 
 # source environment helpers
 . util/env.sh
@@ -12,7 +12,7 @@ payload() {
   "cache_dir": "/tmp/cache",
   "etc_dir": "/data/etc",
   "env_dir": "/data/etc/env.d",
-  "config": { "runtime": "php-5.4", "extensions": ["amqp", "dom", "timezonedb"] }
+  "config": { "runtime": "php-5.4", "extensions": ["amqp", "dom", "timezonedb"], "apache_version": "2.2" }
 }
 END
 }
@@ -105,8 +105,6 @@ setup() {
   # cd into the app code_dir
   cd /tmp/code
 
-  export TEST_VARIABLE=testing
-
   # start php-fpm
   # /data/bin/start-php &
 
@@ -134,5 +132,4 @@ setup() {
   [[ "$output" =~ amqp ]]
   [[ "$output" =~ dom ]]
   [[ "$output" =~ timezonedb ]]
-  [[ "$output" =~ TEST_VARIABLE ]]
 }

test/tests/integration/phpinfo-mod_php-php5.5.bats → test/tests/integration/phpinfo-apache2.2-fpm-php5.5.bats

@@ -1,4 +1,4 @@
-# Integration test for a simple go app
+# Integration test for a simple php app
 
 # source environment helpers
 . util/env.sh
@@ -12,7 +12,7 @@ payload() {
   "cache_dir": "/tmp/cache",
   "etc_dir": "/data/etc",
   "env_dir": "/data/etc/env.d",
-  "config": { "runtime": "php-5.5", "extensions": ["amqp", "dom", "timezonedb"], "apache_php_interpreter": "mod_php" }
+  "config": { "runtime": "php-5.5", "extensions": ["amqp", "dom", "timezonedb"], "apache_version": "2.2" }
 }
 END
 }
@@ -105,7 +105,8 @@ setup() {
   # cd into the app code_dir
   cd /tmp/code
 
-  export TEST_VARIABLE=testing
+  # start php-fpm
+  # /data/bin/start-php &
 
   # start apache
   # /data/bin/start-apache &
@@ -117,7 +118,10 @@ setup() {
   # curl the index
   run curl -s 127.0.0.1:8080 2>/dev/null
 
+  expected="Hello world!"
+
   # kill the server
+  # pkill php-fpm
   # pkill httpd
   pkill php-server
 
@@ -128,5 +132,4 @@ setup() {
   [[ "$output" =~ amqp ]]
   [[ "$output" =~ dom ]]
   [[ "$output" =~ timezonedb ]]
-  [[ "$output" =~ TEST_VARIABLE ]]
 }

test/tests/integration/phpinfo-apache2.2-fpm-php5.6.bats

@@ -0,0 +1,135 @@
+# Integration test for a simple php app
+
+# source environment helpers
+. util/env.sh
+
+payload() {
+  cat <<-END
+{
+  "code_dir": "/tmp/code",
+  "data_dir": "/data",
+  "app_dir": "/tmp/app",
+  "cache_dir": "/tmp/cache",
+  "etc_dir": "/data/etc",
+  "env_dir": "/data/etc/env.d",
+  "config": { "runtime": "php-5.6", "extensions": ["amqp", "dom", "timezonedb"], "apache_version": "2.2" }
+}
+END
+}
+
+setup() {
+  # cd into the engine bin dir
+  cd /engine/bin
+}
+
+@test "setup" {
+  # prepare environment (create directories etc)
+  prepare_environment
+
+  # prepare pkgsrc
+  run prepare_pkgsrc
+
+  # create the code_dir
+  mkdir -p /tmp/code
+
+  # copy the app into place
+  cp -ar /test/apps/phpinfo/* /tmp/code
+
+  run pwd
+
+  [ "$output" = "/engine/bin" ]
+}
+
+@test "boxfile" {
+  if [[ ! -f /engine/bin/boxfile ]]; then
+    skip "No boxfile script"
+  fi
+  run /engine/bin/boxfile "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "build" {
+  if [[ ! -f /engine/bin/build ]]; then
+    skip "No build script"
+  fi
+  run /engine/bin/build "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "compile" {
+  if [[ ! -f /engine/bin/compile ]]; then
+    skip "No compile script"
+  fi
+  run /engine/bin/compile "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "cleanup" {
+  if [[ ! -f /engine/bin/cleanup ]]; then
+    skip "No cleanup script"
+  fi
+  run /engine/bin/cleanup "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "release" {
+  if [[ ! -f /engine/bin/release ]]; then
+    skip "No release script"
+  fi
+  run /engine/bin/release "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "verify" {
+  # remove the code dir
+  rm -rf /tmp/code
+
+  # mv the app_dir to code_dir
+  mv /tmp/app /tmp/code
+
+  # cd into the app code_dir
+  cd /tmp/code
+
+  # start php-fpm
+  # /data/bin/start-php &
+
+  # start apache
+  # /data/bin/start-apache &
+  php-server &
+
+  # sleep a few seconds so the server can start
+  sleep 3
+
+  # curl the index
+  run curl -s 127.0.0.1:8080 2>/dev/null
+
+  expected="Hello world!"
+
+  # kill the server
+  # pkill php-fpm
+  # pkill httpd
+  pkill php-server
+
+  echo "$output"
+
+  [[ "$output" =~ "phpinfo()" ]]
+  [[ "$output" =~ PHP\ Version\ 5\.6\.[0-9]{1,2} ]]
+  [[ "$output" =~ amqp ]]
+  [[ "$output" =~ dom ]]
+  [[ "$output" =~ timezonedb ]]
+}

test/tests/integration/phpinfo-apache2.2-fpm-php7.0.bats

@@ -0,0 +1,135 @@
+# Integration test for a simple php app
+
+# source environment helpers
+. util/env.sh
+
+payload() {
+  cat <<-END
+{
+  "code_dir": "/tmp/code",
+  "data_dir": "/data",
+  "app_dir": "/tmp/app",
+  "cache_dir": "/tmp/cache",
+  "etc_dir": "/data/etc",
+  "env_dir": "/data/etc/env.d",
+  "config": { "runtime": "php-7.0", "extensions": ["amqp", "dom", "timezonedb"], "apache_version": "2.2" }
+}
+END
+}
+
+setup() {
+  # cd into the engine bin dir
+  cd /engine/bin
+}
+
+@test "setup" {
+  # prepare environment (create directories etc)
+  prepare_environment
+
+  # prepare pkgsrc
+  run prepare_pkgsrc
+
+  # create the code_dir
+  mkdir -p /tmp/code
+
+  # copy the app into place
+  cp -ar /test/apps/phpinfo/* /tmp/code
+
+  run pwd
+
+  [ "$output" = "/engine/bin" ]
+}
+
+@test "boxfile" {
+  if [[ ! -f /engine/bin/boxfile ]]; then
+    skip "No boxfile script"
+  fi
+  run /engine/bin/boxfile "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "build" {
+  if [[ ! -f /engine/bin/build ]]; then
+    skip "No build script"
+  fi
+  run /engine/bin/build "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "compile" {
+  if [[ ! -f /engine/bin/compile ]]; then
+    skip "No compile script"
+  fi
+  run /engine/bin/compile "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "cleanup" {
+  if [[ ! -f /engine/bin/cleanup ]]; then
+    skip "No cleanup script"
+  fi
+  run /engine/bin/cleanup "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "release" {
+  if [[ ! -f /engine/bin/release ]]; then
+    skip "No release script"
+  fi
+  run /engine/bin/release "$(payload)"
+
+  echo "$output"
+
+  [ "$status" -eq 0 ]
+}
+
+@test "verify" {
+  # remove the code dir
+  rm -rf /tmp/code
+
+  # mv the app_dir to code_dir
+  mv /tmp/app /tmp/code
+
+  # cd into the app code_dir
+  cd /tmp/code
+
+  # start php-fpm
+  # /data/bin/start-php &
+
+  # start apache
+  # /data/bin/start-apache &
+  php-server &
+
+  # sleep a few seconds so the server can start
+  sleep 3
+
+  # curl the index
+  run curl -s 127.0.0.1:8080 2>/dev/null
+
+  expected="Hello world!"
+
+  # kill the server
+  # pkill php-fpm
+  # pkill httpd
+  pkill php-server
+
+  echo "$output"
+
+  [[ "$output" =~ "phpinfo()" ]]
+  [[ "$output" =~ PHP\ Version\ 7\.0\.[0-9]{1,2} ]]
+  [[ "$output" =~ amqp ]]
+  [[ "$output" =~ dom ]]
+  [[ "$output" =~ timezonedb ]]
+}