Moved fixtures from script/test to script/test/cmd

moved fixtures from script/test to script/test/cmd because according to the go best pactices fixtures should be in the same directory where the test files are
kubernetes · Jun 12, 2017 · f06c414 · f06c414
1 parent 036008b
commit f06c414
Show file tree

Hide file tree

Showing 90 changed files with 263 additions and 263 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ test-openshift:
 # run commandline tests
 .PHONY: test-cmd
 test-cmd:
-	./script/test/cmd/tests.sh
+	go test -v github.com/kubernetes-incubator/kompose/script/test/cmd/
 
 # run all validation tests
 .PHONY: validate
@@ -99,6 +99,7 @@ test-dep:
 	go get github.com/Masterminds/glide
 	go get github.com/sgotti/glide-vc
 	go get github.com/golang/lint/golint
+	go get github.com/joho/godotenv
 
 # build docker image that is used for running all test localy
 .PHONY: test-image

diff --git a/script/test/cmd/fixtures/buildargs/docker-compose.yml b/script/test/cmd/fixtures/buildargs/docker-compose.yml
@@ -5,7 +5,7 @@ services:
         build: 
           context: "./build"
           args:
-            NAME: web
+            - NAME=web
         command: "sleep 3600"
     foo1:
         build:

diff --git a/script/test/cmd/fixtures/buildargs/output-os-template.json b/script/test/cmd/fixtures/buildargs/output-os-template.json
@@ -7,10 +7,10 @@
       "kind": "Service",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo1",
+        "name": "foo",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo1"
+          "io.kompose.service": "foo"
         }
       },
       "spec": {
@@ -22,7 +22,7 @@
           }
         ],
         "selector": {
-          "io.kompose.service": "foo1"
+          "io.kompose.service": "foo"
         },
         "clusterIP": "None"
       },
@@ -34,10 +34,10 @@
       "kind": "Service",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo",
+        "name": "foo1",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo"
+          "io.kompose.service": "foo1"
         }
       },
       "spec": {
@@ -49,7 +49,7 @@
           }
         ],
         "selector": {
-          "io.kompose.service": "foo"
+          "io.kompose.service": "foo1"
         },
         "clusterIP": "None"
       },
@@ -61,10 +61,10 @@
       "kind": "DeploymentConfig",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo1",
+        "name": "foo",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo1"
+          "io.kompose.service": "foo"
         }
       },
       "spec": {
@@ -80,31 +80,31 @@
             "imageChangeParams": {
               "automatic": true,
               "containerNames": [
-                "foo1"
+                "foo"
               ],
               "from": {
                 "kind": "ImageStreamTag",
-                "name": "foo1:latest"
+                "name": "foo:latest"
               }
             }
           }
         ],
         "replicas": 1,
         "test": false,
         "selector": {
-          "io.kompose.service": "foo1"
+          "io.kompose.service": "foo"
         },
         "template": {
           "metadata": {
             "creationTimestamp": null,
             "labels": {
-              "io.kompose.service": "foo1"
+              "io.kompose.service": "foo"
             }
           },
           "spec": {
             "containers": [
               {
-                "name": "foo1",
+                "name": "foo",
                 "image": " ",
                 "args": [
                   "sleep",
@@ -123,10 +123,10 @@
       "kind": "ImageStream",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo1",
+        "name": "foo",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo1"
+          "io.kompose.service": "foo"
         }
       },
       "spec": {},
@@ -138,10 +138,10 @@
       "kind": "BuildConfig",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo1",
+        "name": "foo",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo1"
+          "io.kompose.service": "foo"
         }
       },
       "spec": {
@@ -160,7 +160,7 @@
             "uri": "%URI%",
             "ref": "%REF%"
           },
-          "contextDir": "script/test/fixtures/buildargs/build/"
+          "contextDir": "script/test/cmd/fixtures/buildargs/build/"
         },
         "strategy": {
           "type": "Docker",
@@ -169,18 +169,14 @@
               {
                 "name": "NAME",
                 "value": "web"
-              },
-              {
-                "name": "foo",
-                "value": "bar"
               }
             ]
           }
         },
         "output": {
           "to": {
             "kind": "ImageStreamTag",
-            "name": "foo1:latest"
+            "name": "foo:latest"
           }
         },
         "resources": {},
@@ -195,10 +191,10 @@
       "kind": "DeploymentConfig",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo",
+        "name": "foo1",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo"
+          "io.kompose.service": "foo1"
         }
       },
       "spec": {
@@ -214,31 +210,31 @@
             "imageChangeParams": {
               "automatic": true,
               "containerNames": [
-                "foo"
+                "foo1"
               ],
               "from": {
                 "kind": "ImageStreamTag",
-                "name": "foo:latest"
+                "name": "foo1:latest"
               }
             }
           }
         ],
         "replicas": 1,
         "test": false,
         "selector": {
-          "io.kompose.service": "foo"
+          "io.kompose.service": "foo1"
         },
         "template": {
           "metadata": {
             "creationTimestamp": null,
             "labels": {
-              "io.kompose.service": "foo"
+              "io.kompose.service": "foo1"
             }
           },
           "spec": {
             "containers": [
               {
-                "name": "foo",
+                "name": "foo1",
                 "image": " ",
                 "args": [
                   "sleep",
@@ -257,10 +253,10 @@
       "kind": "ImageStream",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo",
+        "name": "foo1",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo"
+          "io.kompose.service": "foo1"
         }
       },
       "spec": {},
@@ -272,10 +268,10 @@
       "kind": "BuildConfig",
       "apiVersion": "v1",
       "metadata": {
-        "name": "foo",
+        "name": "foo1",
         "creationTimestamp": null,
         "labels": {
-          "io.kompose.service": "foo"
+          "io.kompose.service": "foo1"
         }
       },
       "spec": {
@@ -294,7 +290,7 @@
             "uri": "%URI%",
             "ref": "%REF%"
           },
-          "contextDir": "script/test/fixtures/buildargs/build/"
+          "contextDir": "script/test/cmd/fixtures/buildargs/build/"
         },
         "strategy": {
           "type": "Docker",
@@ -303,14 +299,18 @@
               {
                 "name": "NAME",
                 "value": "web"
+              },
+              {
+                "name": "foo",
+                "value": "bar"
               }
             ]
           }
         },
         "output": {
           "to": {
             "kind": "ImageStreamTag",
-            "name": "foo:latest"
+            "name": "foo1:latest"
           }
         },
         "resources": {},

diff --git a/...res/bundles/dab/docker-compose-bundle.dab → ...res/bundles/dab/docker-compose-bundle.dab b/...res/bundles/dab/docker-compose-bundle.dab → ...res/bundles/dab/docker-compose-bundle.dab
diff --git a/...test/fixtures/bundles/dab/output-k8s.json → .../cmd/fixtures/bundles/dab/output-k8s.json b/...test/fixtures/bundles/dab/output-k8s.json → .../cmd/fixtures/bundles/dab/output-k8s.json
diff --git a/...ures/bundles/dsb/docker-voting-bundle.dsb → ...ures/bundles/dsb/docker-voting-bundle.dsb b/...ures/bundles/dsb/docker-voting-bundle.dsb → ...ures/bundles/dsb/docker-voting-bundle.dsb
diff --git a/...test/fixtures/bundles/dsb/output-k8s.json → .../cmd/fixtures/bundles/dsb/output-k8s.json b/...test/fixtures/bundles/dsb/output-k8s.json → .../cmd/fixtures/bundles/dsb/output-k8s.json
diff --git a/...res/entrypoint-command/docker-compose.yml → ...res/entrypoint-command/docker-compose.yml b/...res/entrypoint-command/docker-compose.yml → ...res/entrypoint-command/docker-compose.yml
diff --git a/...xtures/entrypoint-command/output-k8s.json → ...xtures/entrypoint-command/output-k8s.json b/...xtures/entrypoint-command/output-k8s.json → ...xtures/entrypoint-command/output-k8s.json
diff --git a/...ixtures/entrypoint-command/output-os.json → ...ixtures/entrypoint-command/output-os.json b/...ixtures/entrypoint-command/output-os.json → ...ixtures/entrypoint-command/output-os.json
diff --git a/...res/envvars-separators/docker-compose.yml → ...res/envvars-separators/docker-compose.yml b/...res/envvars-separators/docker-compose.yml → ...res/envvars-separators/docker-compose.yml
diff --git a/...xtures/envvars-separators/output-k8s.json → ...xtures/envvars-separators/output-k8s.json b/...xtures/envvars-separators/output-k8s.json → ...xtures/envvars-separators/output-k8s.json
diff --git a/script/test/fixtures/etherpad/README.md → script/test/cmd/fixtures/etherpad/README.md b/script/test/fixtures/etherpad/README.md → script/test/cmd/fixtures/etherpad/README.md
diff --git a/...ures/etherpad/docker-compose-no-image.yml → ...ures/etherpad/docker-compose-no-image.yml b/...ures/etherpad/docker-compose-no-image.yml → ...ures/etherpad/docker-compose-no-image.yml
diff --git a/...ures/etherpad/docker-compose-no-ports.yml → ...ures/etherpad/docker-compose-no-ports.yml b/...ures/etherpad/docker-compose-no-ports.yml → ...ures/etherpad/docker-compose-no-ports.yml
diff --git a/...test/fixtures/etherpad/docker-compose.yml → .../cmd/fixtures/etherpad/docker-compose.yml b/...test/fixtures/etherpad/docker-compose.yml → .../cmd/fixtures/etherpad/docker-compose.yml
@@ -6,10 +6,10 @@ services:
     ports:
       - "$DB_PORT"
     environment:
-      MYSQL_ROOT_PASSWORD: $ROOT_PASS
-      MYSQL_DATABASE: $DB_NAME
-      MYSQL_PASSWORD: $DB_PASS
-      MYSQL_USER: $DB_USER
+      - MYSQL_ROOT_PASSWORD=$ROOT_PASS
+      - MYSQL_DATABASE=$DB_NAME
+      - MYSQL_PASSWORD=$DB_PASS
+      - MYSQL_USER=$DB_USER
     volumes:
       - /var/lib/mysql
 
@@ -20,8 +20,8 @@ services:
     depends_on:
       - mariadb
     environment:
-      DB_HOST: $DB_HOST
-      DB_DBID: $DB_NAME
-      DB_PASS: $DB_PASS
-      DB_PORT: $DB_PORT
-      DB_USER: $DB_USER
+      - DB_HOST=$DB_HOST
+      - DB_DBID=$DB_NAME
+      - DB_PASS=$DB_PASS
+      - DB_PORT=$DB_PORT
+      - DB_USER=$DB_USER
diff --git a/script/test/fixtures/etherpad/envs → script/test/cmd/fixtures/etherpad/envs b/script/test/fixtures/etherpad/envs → script/test/cmd/fixtures/etherpad/envs
diff --git a/...pt/test/fixtures/etherpad/output-k8s.json → ...est/cmd/fixtures/etherpad/output-k8s.json b/...pt/test/fixtures/etherpad/output-k8s.json → ...est/cmd/fixtures/etherpad/output-k8s.json
@@ -86,24 +86,24 @@
                 ],
                 "env": [
                   {
-                    "name": "DB_USER",
-                    "value": "etherpad"
+                    "name": "DB_HOST",
+                    "value": "mariadb"
                   },
                   {
                     "name": "DB_DBID",
                     "value": "etherpad"
                   },
-                  {
-                    "name": "DB_HOST",
-                    "value": "mariadb"
-                  },
                   {
                     "name": "DB_PASS",
                     "value": "etherpad"
                   },
                   {
                     "name": "DB_PORT",
                     "value": "3306"
+                  },
+                  {
+                    "name": "DB_USER",
+                    "value": "etherpad"
                   }
                 ],
                 "resources": {}
@@ -155,15 +155,15 @@
                 ],
                 "env": [
                   {
-                    "name": "MYSQL_DATABASE",
+                    "name": "MYSQL_ROOT_PASSWORD",
                     "value": "etherpad"
                   },
                   {
-                    "name": "MYSQL_PASSWORD",
+                    "name": "MYSQL_DATABASE",
                     "value": "etherpad"
                   },
                   {
-                    "name": "MYSQL_ROOT_PASSWORD",
+                    "name": "MYSQL_PASSWORD",
                     "value": "etherpad"
                   },
                   {

diff --git a/script/test/fixtures/etherpad/output-os.json → ...test/cmd/fixtures/etherpad/output-os.json b/script/test/fixtures/etherpad/output-os.json → ...test/cmd/fixtures/etherpad/output-os.json
@@ -110,14 +110,14 @@
                   }
                 ],
                 "env": [
-                  {
-                    "name": "DB_DBID",
-                    "value": "etherpad"
-                  },
                   {
                     "name": "DB_HOST",
                     "value": "mariadb"
                   },
+                  {
+                    "name": "DB_DBID",
+                    "value": "etherpad"
+                  },
                   {
                     "name": "DB_PASS",
                     "value": "etherpad"
@@ -233,15 +233,15 @@
                 ],
                 "env": [
                   {
-                    "name": "MYSQL_DATABASE",
+                    "name": "MYSQL_ROOT_PASSWORD",
                     "value": "etherpad"
                   },
                   {
-                    "name": "MYSQL_PASSWORD",
+                    "name": "MYSQL_DATABASE",
                     "value": "etherpad"
                   },
                   {
-                    "name": "MYSQL_ROOT_PASSWORD",
+                    "name": "MYSQL_PASSWORD",
                     "value": "etherpad"
                   },
                   {

diff --git a/...ompose-expose-hostname-multiple-ports.yml → ...ompose-expose-hostname-multiple-ports.yml b/...ompose-expose-hostname-multiple-ports.yml → ...ompose-expose-hostname-multiple-ports.yml
diff --git a/...-files/docker-compose-expose-hostname.yml → ...-files/docker-compose-expose-hostname.yml b/...-files/docker-compose-expose-hostname.yml → ...-files/docker-compose-expose-hostname.yml
diff --git a/...er-compose-expose-true-multiple-ports.yml → ...er-compose-expose-true-multiple-ports.yml b/...er-compose-expose-true-multiple-ports.yml → ...er-compose-expose-true-multiple-ports.yml
diff --git a/...pose-files/docker-compose-expose-true.yml → ...pose-files/docker-compose-expose-true.yml b/...pose-files/docker-compose-expose-true.yml → ...pose-files/docker-compose-expose-true.yml
diff --git a/...netes-expose-hostname-multiple-ports.json → ...netes-expose-hostname-multiple-ports.json b/...netes-expose-hostname-multiple-ports.json → ...netes-expose-hostname-multiple-ports.json
diff --git a/...der-files/kubernetes-expose-hostname.json → ...der-files/kubernetes-expose-hostname.json b/...der-files/kubernetes-expose-hostname.json → ...der-files/kubernetes-expose-hostname.json
diff --git a/...ubernetes-expose-true-multiple-ports.json → ...ubernetes-expose-true-multiple-ports.json b/...ubernetes-expose-true-multiple-ports.json → ...ubernetes-expose-true-multiple-ports.json
diff --git a/...rovider-files/kubernetes-expose-true.json → ...rovider-files/kubernetes-expose-true.json b/...rovider-files/kubernetes-expose-true.json → ...rovider-files/kubernetes-expose-true.json
diff --git a/...shift-expose-hostname-multiple-ports.json → ...shift-expose-hostname-multiple-ports.json b/...shift-expose-hostname-multiple-ports.json → ...shift-expose-hostname-multiple-ports.json
diff --git a/...ider-files/openshift-expose-hostname.json → ...ider-files/openshift-expose-hostname.json b/...ider-files/openshift-expose-hostname.json → ...ider-files/openshift-expose-hostname.json
diff --git a/...openshift-expose-true-multiple-ports.json → ...openshift-expose-true-multiple-ports.json b/...openshift-expose-true-multiple-ports.json → ...openshift-expose-true-multiple-ports.json
diff --git a/...provider-files/openshift-expose-true.json → ...provider-files/openshift-expose-true.json b/...provider-files/openshift-expose-true.json → ...provider-files/openshift-expose-true.json
diff --git a/script/test/fixtures/gitlab/README.md → script/test/cmd/fixtures/gitlab/README.md b/script/test/fixtures/gitlab/README.md → script/test/cmd/fixtures/gitlab/README.md