@@ -104,14 +104,14 @@ func TestExampleObjectSchemas(t *testing.T) {

 			"postgresql-ephemeral-template":  &templateapi.Template{},

 			"mongodb-ephemeral-template":     &templateapi.Template{},

 		},

-		"../test/extended/fixtures/ldap": {

+		"../test/extended/testdata/ldap": {

 			"ldapserver-buildconfig":         &buildapi.BuildConfig{},

 			"ldapserver-deploymentconfig":    &deployapi.DeploymentConfig{},

 			"ldapserver-imagestream":         &imageapi.ImageStream{},

 			"ldapserver-imagestream-testenv": &imageapi.ImageStream{},

 			"ldapserver-service":             &kapi.Service{},

 		},

-		"../test/integration/fixtures": {

+		"../test/integration/testdata": {

 			// TODO fix this test to  handle json and yaml

 			"project-request-template-with-quota": nil, // skip a yaml file

 			"test-deployment-config":              &deployapi.DeploymentConfig{},

@@ -123,7 +123,7 @@ func TestExampleObjectSchemas(t *testing.T) {

 			"test-buildcli":                       &kapi.List{},

 			"test-buildcli-beta2":                 &kapi.List{},

 		},

-		"../test/templates/fixtures": {

+		"../test/templates/testdata": {

 			"crunchydata-pod": nil, // Explicitly fails validation, but should pass transformation

 			"guestbook_list":  &templateapi.Template{},

 			"guestbook":       &templateapi.Template{},

@@ -31,7 +31,7 @@ func GivenRequestWithPayload(t *testing.T, filename string) *http.Request {

 }

 func GivenRequestWithPayloadAndContentType(t *testing.T, filename, contentType string) *http.Request {

-	data, err := ioutil.ReadFile("fixtures/" + filename)

+	data, err := ioutil.ReadFile("testdata/" + filename)

 	if err != nil {

 		t.Errorf("Error reading setup data: %v", err)

 		return nil

@@ -42,7 +42,7 @@ func GivenRequestWithPayloadAndContentType(t *testing.T, filename, contentType s

 }

 func GivenRequestWithRefsPayload(t *testing.T) *http.Request {

-	data, err := ioutil.ReadFile("fixtures/post-receive-git.json")

+	data, err := ioutil.ReadFile("testdata/post-receive-git.json")

 	if err != nil {

 		t.Errorf("Error reading setup data: %v", err)

 		return nil

@@ -249,7 +249,7 @@ func postFile(eventHeader, eventName, filename, url string, expStatusCode int, t

 }

 func postFileWithCharset(eventHeader, eventName, filename, url, charset string, expStatusCode int, t *testing.T) *http.Request {

-	data, err := ioutil.ReadFile("fixtures/" + filename)

+	data, err := ioutil.ReadFile("testdata/" + filename)

 	if err != nil {

 		t.Errorf("Failed to open %s: %v", filename, err)

 	}

@@ -318,7 +318,7 @@ func setup(t *testing.T, filename, eventType, ref string) *testContext {

 		},

 		path: "/foobar",

 	}

-	event, err := ioutil.ReadFile("fixtures/" + filename)

+	event, err := ioutil.ReadFile("testdata/" + filename)

 	if err != nil {

 		t.Errorf("Failed to open %s: %v", filename, err)

 	}

@@ -14,7 +14,7 @@ import (

 func TestNewClient(t *testing.T) {

 	o := testclient.NewObjects(kapi.Scheme, kapi.Codecs.UniversalDecoder())

-	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.yaml", o, kapi.Codecs.UniversalDecoder()); err != nil {

+	if err := testclient.AddObjectsFromPath("../../../test/integration/testdata/test-deployment-config.yaml", o, kapi.Codecs.UniversalDecoder()); err != nil {

 		t.Fatal(err)

 	}

 	oc, _ := NewFixtureClients(o)

@@ -52,7 +52,7 @@ func TestProjectStatus(t *testing.T) {

 			},

 		},

 		"empty service": {

-			Path: "../../../../test/fixtures/app-scenarios/k8s-service-with-nothing.json",

+			Path: "../../../../test/testdata/app-scenarios/k8s-service-with-nothing.json",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -67,7 +67,7 @@ func TestProjectStatus(t *testing.T) {

 			},

 		},

 		"service with RC": {

-			Path: "../../../../test/fixtures/app-scenarios/k8s-unserviced-rc.json",

+			Path: "../../../../test/testdata/app-scenarios/k8s-unserviced-rc.json",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -140,7 +140,7 @@ func TestProjectStatus(t *testing.T) {

 			},

 		},

 		"unstarted build": {

-			Path: "../../../../test/fixtures/app-scenarios/new-project-no-build.yaml",

+			Path: "../../../../test/testdata/app-scenarios/new-project-no-build.yaml",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -196,7 +196,7 @@ func TestProjectStatus(t *testing.T) {

 			},

 		},

 		"running build": {

-			Path: "../../../../test/fixtures/app-scenarios/new-project-one-build.yaml",

+			Path: "../../../../test/testdata/app-scenarios/new-project-one-build.yaml",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -215,7 +215,7 @@ func TestProjectStatus(t *testing.T) {

 			Time: mustParseTime("2015-04-06T21:20:03Z"),

 		},

 		"a/b test DeploymentConfig": {

-			Path: "../../../../test/fixtures/app-scenarios/new-project-two-deployment-configs.yaml",

+			Path: "../../../../test/testdata/app-scenarios/new-project-two-deployment-configs.yaml",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -235,7 +235,7 @@ func TestProjectStatus(t *testing.T) {

 			Time: mustParseTime("2015-04-06T21:20:03Z"),

 		},

 		"with real deployments": {

-			Path: "../../../../test/fixtures/app-scenarios/new-project-deployed-app.yaml",

+			Path: "../../../../test/testdata/app-scenarios/new-project-deployed-app.yaml",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -294,7 +294,7 @@ func TestProjectStatus(t *testing.T) {

 			},

 		},

 		"monopod": {

-			Path: "../../../../test/fixtures/app-scenarios/k8s-lonely-pod.json",

+			Path: "../../../../test/testdata/app-scenarios/k8s-lonely-pod.json",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -308,7 +308,7 @@ func TestProjectStatus(t *testing.T) {

 			},

 		},

 		"deploys single pod": {

-			Path: "../../../../test/fixtures/simple-deployment.yaml",

+			Path: "../../../../test/testdata/simple-deployment.yaml",

 			Extra: []runtime.Object{

 				&projectapi.Project{

 					ObjectMeta: kapi.ObjectMeta{Name: "example", Namespace: ""},

@@ -58,7 +58,7 @@ func TestBootstrapClusterRoles(t *testing.T) {

 }

 func testObjects(t *testing.T, list *api.List, fixtureFilename string) {

-	filename := filepath.Join("../../../../test/fixtures/bootstrappolicy", fixtureFilename)

+	filename := filepath.Join("../../../../test/testdata/bootstrappolicy", fixtureFilename)

 	expectedYAML, err := ioutil.ReadFile(filename)

 	if err != nil {

 		t.Fatal(err)

@@ -15,7 +15,7 @@ import (

 )

 func TestCredentialsForSecrets(t *testing.T) {

-	data, err := ioutil.ReadFile("../../../test/fixtures/image-secrets.json")

+	data, err := ioutil.ReadFile("../../../test/testdata/image-secrets.json")

 	if err != nil {

 		t.Fatal(err)

 	}

@@ -33,7 +33,7 @@ func makeParameter(name, value, generate string, required bool) api.Parameter {

 func TestAddParameter(t *testing.T) {

 	var template api.Template

-	jsonData, _ := ioutil.ReadFile("../../test/templates/fixtures/guestbook.json")

+	jsonData, _ := ioutil.ReadFile("../../test/templates/testdata/guestbook.json")

 	json.Unmarshal(jsonData, &template)

 	AddParameter(&template, makeParameter("CUSTOM_PARAM", "1", "", false))

@@ -383,12 +383,12 @@ func TestEvaluateLabels(t *testing.T) {

 func TestProcessTemplateParameters(t *testing.T) {

 	var template, expectedTemplate api.Template

-	jsonData, _ := ioutil.ReadFile("../../test/templates/fixtures/guestbook.json")

+	jsonData, _ := ioutil.ReadFile("../../test/templates/testdata/guestbook.json")

 	if err := runtime.DecodeInto(kapi.Codecs.UniversalDecoder(), jsonData, &template); err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

-	expectedData, _ := ioutil.ReadFile("../../test/templates/fixtures/guestbook_list.json")

+	expectedData, _ := ioutil.ReadFile("../../test/templates/testdata/guestbook_list.json")

 	if err := runtime.DecodeInto(kapi.Codecs.UniversalDecoder(), expectedData, &expectedTemplate); err != nil {

 		t.Fatalf("unexpected error: %v", err)

 	}

@@ -69,7 +69,7 @@ func TestBuilder(t *testing.T) {

 		ErrFn      func(err error) bool

 	}{

 		{

-			Dockerfile: "fixtures/dir/Dockerfile",

+			Dockerfile: "testdata/dir/Dockerfile",

 			From:       "busybox",

 			Copies: []Copy{

 				{Src: ".", Dest: []string{"/"}, Download: false},

@@ -81,7 +81,7 @@ func TestBuilder(t *testing.T) {

 			},

 		},

 		{

-			Dockerfile: "fixtures/ignore/Dockerfile",

+			Dockerfile: "testdata/ignore/Dockerfile",

 			From:       "busybox",

 			Copies: []Copy{

 				{Src: ".", Dest: []string{"/"}},

@@ -91,7 +91,7 @@ func TestBuilder(t *testing.T) {

 			},

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.env",

+			Dockerfile: "testdata/Dockerfile.env",

 			From:       "busybox",

 			Config: docker.Config{

 				Env:   []string{"name=value", "name2=value2a            value2b", "name1=value1", "name3=value3a\\n\"value3b\"", "name4=value4a\\\\nvalue4b"},

@@ -99,7 +99,7 @@ func TestBuilder(t *testing.T) {

 			},

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.edgecases",

+			Dockerfile: "testdata/Dockerfile.edgecases",

 			From:       "busybox",

 			Copies: []Copy{

 				{Src: ".", Dest: []string{"/"}, Download: true},

@@ -126,7 +126,7 @@ func TestBuilder(t *testing.T) {

 			},

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.exposedefault",

+			Dockerfile: "testdata/Dockerfile.exposedefault",

 			From:       "busybox",

 			Config: docker.Config{

 				ExposedPorts: map[docker.Port]struct{}{"3469/tcp": {}},

@@ -134,7 +134,7 @@ func TestBuilder(t *testing.T) {

 			},

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.add",

+			Dockerfile: "testdata/Dockerfile.add",

 			From:       "busybox",

 			Copies: []Copy{

 				{Src: "https://github.com/openshift/origin/raw/master/README.md", Dest: []string{"/README.md"}, Download: true},

@@ -220,14 +220,14 @@ func TestCalcCopyInfo(t *testing.T) {

 	}{

 		{

 			origPath:       "subdir/*",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths:          map[string]struct{}{"subdir/file2": {}},

 		},

 		{

 			origPath:       "*",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -238,7 +238,7 @@ func TestCalcCopyInfo(t *testing.T) {

 		},

 		{

 			origPath:       ".",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -249,7 +249,7 @@ func TestCalcCopyInfo(t *testing.T) {

 		},

 		{

 			origPath:       "/.",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -260,7 +260,7 @@ func TestCalcCopyInfo(t *testing.T) {

 		},

 		{

 			origPath:       "subdir/",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -269,7 +269,7 @@ func TestCalcCopyInfo(t *testing.T) {

 		},

 		{

 			origPath:       "subdir",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -278,7 +278,7 @@ func TestCalcCopyInfo(t *testing.T) {

 		},

 		{

 			origPath:       "subdir/.",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -286,17 +286,17 @@ func TestCalcCopyInfo(t *testing.T) {

 			},

 		},

 		{

-			origPath:       "fixtures/dir/subdir/.",

+			origPath:       "testdata/dir/subdir/.",

 			rootPath:       "",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

-				"fixtures/dir/subdir/": {},

+				"testdata/dir/subdir/": {},

 			},

 		},

 		{

 			origPath:       "subdir/",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -305,7 +305,7 @@ func TestCalcCopyInfo(t *testing.T) {

 		},

 		{

 			origPath:       "subdir/",

-			rootPath:       "fixtures/dir",

+			rootPath:       "testdata/dir",

 			allowWildcards: true,

 			errFn:          nilErr,

 			paths: map[string]struct{}{

@@ -65,23 +65,23 @@ type conformanceTest struct {

 func TestConformanceInternal(t *testing.T) {

 	testCases := []conformanceTest{

 		{

-			ContextDir: "fixtures/dir",

+			ContextDir: "testdata/dir",

 		},

 		// TODO: Fix this test

 		// {

-		// 	ContextDir: "fixtures/ignore",

+		// 	ContextDir: "testdata/ignore",

 		// },

 		{

-			Dockerfile: "fixtures/Dockerfile.env",

+			Dockerfile: "testdata/Dockerfile.env",

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.edgecases",

+			Dockerfile: "testdata/Dockerfile.edgecases",

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.exposedefault",

+			Dockerfile: "testdata/Dockerfile.exposedefault",

 		},

 		{

-			Dockerfile: "fixtures/Dockerfile.add",

+			Dockerfile: "testdata/Dockerfile.add",

 		},

 	}

@@ -178,7 +178,7 @@ os::cmd::expect_success 'oadm policy reconcile-cluster-roles clusterrole/cluster

 os::cmd::expect_success 'oc get clusterrole/cluster-status'

 # test reconciliation protection by replacing the basic-user role with one that has missing default permissions, and extra non-default permissions

-os::cmd::expect_success 'oc replace --force -f ./test/fixtures/basic-user-with-groups-without-projectrequests.yaml'

+os::cmd::expect_success 'oc replace --force -f ./test/testdata/basic-user-with-groups-without-projectrequests.yaml'

 # 1. mark the role as protected, and ensure the role is skipped by reconciliation

 os::cmd::expect_success 'oc annotate clusterrole/basic-user openshift.io/reconcile-protect=true'

 os::cmd::expect_success_and_text     'oadm policy reconcile-cluster-roles basic-user --additive-only=false --confirm' 'skipped: clusterrole/basic-user'

@@ -194,7 +194,7 @@ os::cmd::expect_success_and_text     'oadm policy reconcile-cluster-roles basic-

 os::cmd::expect_success_and_not_text 'oadm policy reconcile-cluster-roles basic-user --additive-only=false --confirm' 'clusterrole/basic-user'

 # test label/annotation reconciliation by replacing the basic-user role with one that has custom labels, annotations, and permissions

-os::cmd::expect_success 'oc replace --force -f ./test/fixtures/basic-user-with-annotations-labels-groups-without-projectrequests.yaml'

+os::cmd::expect_success 'oc replace --force -f ./test/testdata/basic-user-with-annotations-labels-groups-without-projectrequests.yaml'

 # display shows customized labels/annotations

 os::cmd::expect_success_and_text 'oadm policy reconcile-cluster-roles' 'custom-label'

 os::cmd::expect_success_and_text 'oadm policy reconcile-cluster-roles' 'custom-annotation'

@@ -217,7 +217,7 @@ os::cmd::expect_failure 'oc get clusterrolebinding/cluster-status-binding'

 os::cmd::expect_success 'oadm policy reconcile-cluster-role-bindings --confirm'

 os::cmd::expect_success 'oc get clusterrolebinding/cluster-status-binding'

 # Customize a binding

-os::cmd::expect_success 'oc replace --force -f ./test/fixtures/basic-users-binding.json'

+os::cmd::expect_success 'oc replace --force -f ./test/testdata/basic-users-binding.json'

 # display shows customized labels/annotations

 os::cmd::expect_success_and_text 'oadm policy reconcile-cluster-role-bindings' 'custom-label'

 os::cmd::expect_success_and_text 'oadm policy reconcile-cluster-role-bindings' 'custom-annotation'

@@ -242,11 +242,11 @@ echo "admin-reconcile-cluster-role-bindings: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/admin/role-reapers"

-os::cmd::expect_success "oc create -f test/extended/fixtures/roles/policy-roles.yaml"

+os::cmd::expect_success "oc create -f test/extended/testdata/roles/policy-roles.yaml"

 os::cmd::expect_success "oc get rolebinding/basic-users"

 os::cmd::expect_success "oc delete role/basic-user"

 os::cmd::expect_failure "oc get rolebinding/basic-users"

-os::cmd::expect_success "oc create -f test/extended/fixtures/roles/policy-clusterroles.yaml"

+os::cmd::expect_success "oc create -f test/extended/testdata/roles/policy-clusterroles.yaml"

 os::cmd::expect_success "oc get clusterrolebinding/basic-users2"

 os::cmd::expect_success "oc delete clusterrole/basic-user2"

 os::cmd::expect_failure "oc get clusterrolebinding/basic-users2"

@@ -340,7 +340,7 @@ os::test::junit::declare_suite_start "cmd/admin/complex-scenarios"

 os::cmd::expect_success 'oadm new-project example --admin="createuser"'

 os::cmd::expect_success 'oc project example'

 os::cmd::try_until_success 'oc get serviceaccount default'

-os::cmd::expect_success 'oc create -f test/fixtures/app-scenarios'

+os::cmd::expect_success 'oc create -f test/testdata/app-scenarios'

 os::cmd::expect_success 'oc status'

 os::cmd::expect_success 'oc status -o dot'

 echo "complex-scenarios: ok"

@@ -384,7 +384,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/admin/policybinding-required"

 # Admin can't bind local roles without cluster-admin permissions

-os::cmd::expect_success "oc create -f test/extended/fixtures/roles/empty-role.yaml -n cmd-admin"

+os::cmd::expect_success "oc create -f test/extended/testdata/roles/empty-role.yaml -n cmd-admin"

 os::cmd::expect_success "oc delete policybinding/cmd-admin:default -n cmd-admin"

 os::cmd::expect_success 'oadm policy add-role-to-user admin local-admin  -n cmd-admin'

 os::cmd::try_until_text "oc policy who-can get policybindings -n cmd-admin" "local-admin"

@@ -22,29 +22,29 @@ os::cmd::expect_success 'oc login -u system:admin'

 username=$(oc get user/scoped-user -o jsonpath={.metadata.name})

 useruid=$(oc get user/scoped-user -o jsonpath={.metadata.uid})

-whoamitoken=$(oc process -f ${OS_ROOT}/test/fixtures/authentication/scoped-token-template.yaml TOKEN_PREFIX=whoami SCOPE=user:info USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

+whoamitoken=$(oc process -f ${OS_ROOT}/test/testdata/authentication/scoped-token-template.yaml TOKEN_PREFIX=whoami SCOPE=user:info USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

 os::cmd::expect_success_and_text 'oc get user/~ --token="${whoamitoken}"' "${username}"

 os::cmd::expect_failure_and_text 'oc get pods --token="${whoamitoken}" -n cmd-authentication' 'prevent this action; User "scoped-user" cannot list pods in project "cmd-authentication"'

-listprojecttoken=$(oc process -f ${OS_ROOT}/test/fixtures/authentication/scoped-token-template.yaml TOKEN_PREFIX=listproject SCOPE=user:list-projects USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

+listprojecttoken=$(oc process -f ${OS_ROOT}/test/testdata/authentication/scoped-token-template.yaml TOKEN_PREFIX=listproject SCOPE=user:list-projects USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

 os::cmd::expect_success_and_text 'oc get projects --token="${listprojecttoken}"' 'cmd-authentication'

 os::cmd::expect_failure_and_text 'oc get user/~ --token="${listprojecttoken}"' 'prevent this action; User "scoped-user" cannot get users at the cluster scope'

 os::cmd::expect_failure_and_text 'oc get pods --token="${listprojecttoken}" -n cmd-authentication' 'prevent this action; User "scoped-user" cannot list pods in project "cmd-authentication"'

-adminnonescalatingpowerstoken=$(oc process -f ${OS_ROOT}/test/fixtures/authentication/scoped-token-template.yaml TOKEN_PREFIX=admin SCOPE=role:admin:* USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

+adminnonescalatingpowerstoken=$(oc process -f ${OS_ROOT}/test/testdata/authentication/scoped-token-template.yaml TOKEN_PREFIX=admin SCOPE=role:admin:* USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

 os::cmd::expect_failure_and_text 'oc get user/~ --token="${adminnonescalatingpowerstoken}"' 'prevent this action; User "scoped-user" cannot get users at the cluster scope'

 os::cmd::expect_failure_and_text 'oc get secrets --token="${adminnonescalatingpowerstoken}" -n cmd-authentication' 'prevent this action; User "scoped-user" cannot list secrets in project "cmd-authentication"'

 os::cmd::expect_success_and_text 'oc get projects/cmd-authentication --token="${adminnonescalatingpowerstoken}" -n cmd-authentication' 'cmd-authentication'

-allescalatingpowerstoken=$(oc process -f ${OS_ROOT}/test/fixtures/authentication/scoped-token-template.yaml TOKEN_PREFIX=clusteradmin SCOPE='role:cluster-admin:*:!' USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

+allescalatingpowerstoken=$(oc process -f ${OS_ROOT}/test/testdata/authentication/scoped-token-template.yaml TOKEN_PREFIX=clusteradmin SCOPE='role:cluster-admin:*:!' USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

 os::cmd::expect_success_and_text 'oc get user/~ --token="${allescalatingpowerstoken}"' "${username}"

 os::cmd::expect_success 'oc get secrets --token="${allescalatingpowerstoken}" -n cmd-authentication'

 # scopes allow it, but authorization doesn't

 os::cmd::expect_failure_and_text 'oc get secrets --token="${allescalatingpowerstoken}" -n default' 'cannot list secrets in project'

 os::cmd::expect_success_and_text 'oc get projects --token="${allescalatingpowerstoken}"' 'cmd-authentication'

-accesstoken=$(oc process -f ${OS_ROOT}/test/fixtures/authentication/scoped-token-template.yaml TOKEN_PREFIX=access SCOPE=user:check-access USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

-os::cmd::expect_success_and_text 'curl -k -XPOST -H "Content-Type: application/json" -H "Authorization: Bearer ${accesstoken}" ${API_SCHEME}://${API_HOST}:${API_PORT}/oapi/v1/namespaces/cmd-authentication/localsubjectaccessreviews -d @${OS_ROOT}/test/fixtures/authentication/localsubjectaccessreview.json' '"kind": "SubjectAccessReviewResponse"'

+accesstoken=$(oc process -f ${OS_ROOT}/test/testdata/authentication/scoped-token-template.yaml TOKEN_PREFIX=access SCOPE=user:check-access USER_NAME="${username}" USER_UID="${useruid}" | oc create -f - -o name | awk -F/ '{print $2}')

+os::cmd::expect_success_and_text 'curl -k -XPOST -H "Content-Type: application/json" -H "Authorization: Bearer ${accesstoken}" ${API_SCHEME}://${API_HOST}:${API_PORT}/oapi/v1/namespaces/cmd-authentication/localsubjectaccessreviews -d @${OS_ROOT}/test/testdata/authentication/localsubjectaccessreview.json' '"kind": "SubjectAccessReviewResponse"'

 os::cmd::expect_success_and_text 'oc policy can-i create pods --token=${accesstoken} -n cmd-authentication --ignore-scopes' 'yes'

 os::cmd::expect_success_and_text 'oc policy can-i create pods --token=${accesstoken} -n cmd-authentication' 'no'

 os::cmd::expect_success_and_text "oc policy can-i create pods --token=${accesstoken} -n cmd-authentication --scopes='role:admin:*'" 'yes'

@@ -80,7 +80,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/basicresources/resource-builder"

 # Test resource builder filtering of files with expected extensions inside directories, and individual files without expected extensions

-os::cmd::expect_success 'oc create -f test/fixtures/resource-builder/directory -f test/fixtures/resource-builder/json-no-extension -f test/fixtures/resource-builder/yml-no-extension'

+os::cmd::expect_success 'oc create -f test/testdata/resource-builder/directory -f test/testdata/resource-builder/json-no-extension -f test/testdata/resource-builder/yml-no-extension'

 # Explicitly specified extensionless files

 os::cmd::expect_success 'oc get secret json-no-extension yml-no-extension'

 # Scanned files with extensions inside directories

@@ -111,20 +111,20 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/basicresources/services"

 os::cmd::expect_success 'oc get services'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-service.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-service.json'

 os::cmd::expect_success 'oc delete services frontend'

 echo "services: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/basicresources/list-version-conversion"

-os::cmd::expect_success 'oc create   -f test/fixtures/mixed-api-versions.yaml'

-os::cmd::expect_success 'oc get      -f test/fixtures/mixed-api-versions.yaml -o yaml'

-os::cmd::expect_success 'oc label    -f test/fixtures/mixed-api-versions.yaml mylabel=a'

-os::cmd::expect_success 'oc annotate -f test/fixtures/mixed-api-versions.yaml myannotation=b'

+os::cmd::expect_success 'oc create   -f test/testdata/mixed-api-versions.yaml'

+os::cmd::expect_success 'oc get      -f test/testdata/mixed-api-versions.yaml -o yaml'

+os::cmd::expect_success 'oc label    -f test/testdata/mixed-api-versions.yaml mylabel=a'

+os::cmd::expect_success 'oc annotate -f test/testdata/mixed-api-versions.yaml myannotation=b'

 # Make sure all six resources, with different API versions, got labeled and annotated

-os::cmd::expect_success_and_text 'oc get -f test/fixtures/mixed-api-versions.yaml --output-version=v1 --output=jsonpath="{..metadata.labels.mylabel}"'           '^a a a a a a$'

-os::cmd::expect_success_and_text 'oc get -f test/fixtures/mixed-api-versions.yaml --output-version=v1 --output=jsonpath="{..metadata.annotations.myannotation}"' '^b b b b b b$'

-os::cmd::expect_success 'oc delete   -f test/fixtures/mixed-api-versions.yaml'

+os::cmd::expect_success_and_text 'oc get -f test/testdata/mixed-api-versions.yaml --output-version=v1 --output=jsonpath="{..metadata.labels.mylabel}"'           '^a a a a a a$'

+os::cmd::expect_success_and_text 'oc get -f test/testdata/mixed-api-versions.yaml --output-version=v1 --output=jsonpath="{..metadata.annotations.myannotation}"' '^b b b b b b$'

+os::cmd::expect_success 'oc delete   -f test/testdata/mixed-api-versions.yaml'

 echo "list version conversion: ok"

 os::test::junit::declare_suite_end

@@ -149,9 +149,9 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/basicresources/routes"

 os::cmd::expect_success 'oc get routes'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-route.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-route.json'

 os::cmd::expect_success 'oc delete routes testroute'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-service.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-service.json'

 os::cmd::expect_success 'oc create route passthrough --service=svc/frontend'

 os::cmd::expect_success 'oc delete routes frontend'

 os::cmd::expect_success 'oc create route edge --path /test --service=services/non-existent --port=80'

@@ -187,7 +187,7 @@ os::cmd::expect_success_and_text "oc set probe ${arg} -o yaml --liveness --get-u

 os::cmd::expect_success_and_text "oc set probe ${arg} -o yaml --liveness --get-url=http://127.0.0.1:port/path" "scheme: HTTP"

 os::cmd::expect_success_and_text "oc set probe ${arg} -o yaml --liveness --get-url=https://127.0.0.1:port/path" "host: 127.0.0.1"

 os::cmd::expect_success_and_text "oc set probe ${arg} -o yaml --liveness --get-url=https://127.0.0.1:port/path" "port: port"

-os::cmd::expect_success "oc create -f test/integration/fixtures/test-deployment-config.yaml"

+os::cmd::expect_success "oc create -f test/integration/testdata/test-deployment-config.yaml"

 os::cmd::expect_failure_and_text "oc set probe dc/test-deployment-config --liveness" "Required value: must specify a handler type"

 os::cmd::expect_success_and_text "oc set probe dc test-deployment-config --liveness --open-tcp=8080" "updated"

 os::cmd::expect_success_and_text "oc set probe dc/test-deployment-config --liveness --open-tcp=8080" "was not changed"

@@ -215,8 +215,8 @@ echo "set probe: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/basicresources/setenv"

-os::cmd::expect_success "oc create -f test/integration/fixtures/test-deployment-config.yaml"

-os::cmd::expect_success "oc create -f test/integration/fixtures/test-buildcli.json"

+os::cmd::expect_success "oc create -f test/integration/testdata/test-deployment-config.yaml"

+os::cmd::expect_success "oc create -f test/integration/testdata/test-buildcli.json"

 os::cmd::expect_success_and_text "oc set env dc/test-deployment-config FOO=bar" "updated"

 os::cmd::expect_success_and_text "oc set env dc/test-deployment-config --list" "FOO=bar"

 os::cmd::expect_success_and_text "oc set env bc --all FOO=bar" "updated"

@@ -229,7 +229,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/basicresources/expose"

 # Expose service as a route

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-service.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-service.json'

 os::cmd::expect_failure 'oc expose service frontend --create-external-load-balancer'

 os::cmd::expect_failure 'oc expose service frontend --port=40 --type=NodePort'

 os::cmd::expect_success 'oc expose service frontend --path=/test'

@@ -238,20 +238,20 @@ os::cmd::expect_success_and_text "oc get route frontend --output-version=v1 --te

 os::cmd::expect_success_and_text "oc get route frontend --output-version=v1 --template='{{.spec.port.targetPort}}'" "<no value>" # no target port for services with unnamed ports

 os::cmd::expect_success 'oc delete svc,route -l name=frontend'

 # Test that external services are exposable

-os::cmd::expect_success 'oc create -f test/fixtures/external-service.yaml'

+os::cmd::expect_success 'oc create -f test/testdata/external-service.yaml'

 os::cmd::expect_success 'oc expose svc/external'

 os::cmd::expect_success_and_text 'oc get route external' 'external=service'

 os::cmd::expect_success 'oc delete route external'

 os::cmd::expect_success 'oc delete svc external'

 # Expose multiport service and verify we set a port in the route

-os::cmd::expect_success 'oc create -f test/fixtures/multiport-service.yaml'

+os::cmd::expect_success 'oc create -f test/testdata/multiport-service.yaml'

 os::cmd::expect_success 'oc expose svc/frontend --name route-with-set-port'

 os::cmd::expect_success_and_text "oc get route route-with-set-port --template='{{.spec.port.targetPort}}' --output-version=v1" "web"

 echo "expose: ok"

 os::test::junit::declare_suite_end

 # Test OAuth access token describer

-os::cmd::expect_success 'oc create -f test/fixtures/oauthaccesstoken.yaml'

+os::cmd::expect_success 'oc create -f test/testdata/oauthaccesstoken.yaml'

 os::cmd::expect_success_and_text "oc describe oauthaccesstoken DYGZDLucARCPIfUeKPhsgPfn0WBLR_9KdeREH0c9iod" "DYGZDLucARCPIfUeKPhsgPfn0WBLR_9KdeREH0c9iod"

 echo "OAuth descriptor: ok"

@@ -130,7 +130,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/builds/setbuildhook"

 # Validate the set build-hook command

-arg="-f test/fixtures/test-bc.yaml"

+arg="-f test/testdata/test-bc.yaml"

 os::cmd::expect_failure_and_text "oc set build-hook" "error: one or more build configs"

 os::cmd::expect_failure_and_text "oc set build-hook ${arg}" "error: you must specify a type of hook"

 os::cmd::expect_success_and_text "oc set build-hook ${arg} --post-commit -o yaml -- echo 'hello world'" 'postCommit:'

@@ -141,7 +141,7 @@ os::cmd::expect_success_and_not_text "oc set build-hook ${arg} --post-commit -o

 os::cmd::expect_success_and_text "oc set build-hook ${arg} --post-commit --command -o yaml -- echo 'hello world'" 'command:'

 os::cmd::expect_success_and_text "oc set build-hook ${arg} --post-commit -o yaml --script='echo \"hello world\"'" 'script: echo \"hello world\"'

 # Server object tests

-os::cmd::expect_success "oc create -f test/fixtures/test-bc.yaml"

+os::cmd::expect_success "oc create -f test/testdata/test-bc.yaml"

 os::cmd::expect_failure_and_text "oc set build-hook bc/test-buildconfig --post-commit" "you must specify either a script or command"

 os::cmd::expect_success_and_text "oc set build-hook test-buildconfig --post-commit -- echo 'hello world'" "updated"

 os::cmd::expect_success_and_text "oc set build-hook bc/test-buildconfig --post-commit -- echo 'hello world'" "was not changed"

@@ -157,7 +157,7 @@ echo "set build-hook: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/builds/start-build"

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-buildcli.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-buildcli.json'

 # a build for which there is not an upstream tag in the corresponding imagerepo, so

 # the build should use the image field as defined in the buildconfig

 started=$(oc start-build ruby-sample-build-invalidtag)

@@ -20,7 +20,7 @@ trap os::test::junit::reconcile_output EXIT

 os::test::junit::declare_suite_start "cmd/debug"

 # This test validates the debug command

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

 os::cmd::expect_success_and_text "oc debug dc/test-deployment-config -o yaml" '\- /bin/sh'

 os::cmd::expect_success_and_text "oc debug dc/test-deployment-config --keep-annotations -o yaml" 'annotations:'

 os::cmd::expect_success_and_text "oc debug dc/test-deployment-config --as-root -o yaml" 'runAsUser: 0'

@@ -24,7 +24,7 @@ os::test::junit::declare_suite_start "cmd/deployments"

 os::cmd::expect_success 'oc get deploymentConfigs'

 os::cmd::expect_success 'oc get dc'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

 os::cmd::expect_success 'oc describe deploymentConfigs test-deployment-config'

 os::cmd::expect_success_and_text 'oc get dc -o name' 'deploymentconfig/test-deployment-config'

 os::cmd::try_until_success 'oc get rc/test-deployment-config-1'

@@ -54,7 +54,7 @@ os::cmd::expect_success_and_text 'oc env dc/test-deployment-config OTHER=foo -o

 os::cmd::expect_success_and_text 'echo OTHER=foo | oc env dc/test-deployment-config -e - --list' 'OTHER=foo'

 os::cmd::expect_success_and_not_text 'echo #OTHER=foo | oc env dc/test-deployment-config -e - --list' 'OTHER=foo'

 os::cmd::expect_success 'oc env dc/test-deployment-config TEST=bar OTHER=baz BAR-'

-os::cmd::expect_success_and_not_text 'oc env -f test/integration/fixtures/test-deployment-config.yaml TEST=VERSION -o yaml' 'v1beta3'

+os::cmd::expect_success_and_not_text 'oc env -f test/integration/testdata/test-deployment-config.yaml TEST=VERSION -o yaml' 'v1beta3'

 os::cmd::expect_success 'oc env dc/test-deployment-config A=a B=b C=c D=d E=e F=f G=g'

 os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'A=a'

 os::cmd::expect_success_and_text 'oc env dc/test-deployment-config --list' 'B=b'

@@ -123,7 +123,7 @@ echo "stop: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/deployments/autoscale"

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

 os::cmd::expect_success 'oc autoscale dc/test-deployment-config --max 5'

 os::cmd::expect_success_and_text "oc get hpa/test-deployment-config --template='{{.spec.maxReplicas}}'" "5"

 os::cmd::expect_success 'oc delete dc/test-deployment-config'

@@ -133,7 +133,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/deployments/setdeploymenthook"

 # Validate the set deployment-hook command

-arg="-f test/integration/fixtures/test-deployment-config.yaml"

+arg="-f test/integration/testdata/test-deployment-config.yaml"

 os::cmd::expect_failure_and_text "oc set deployment-hook" "error: one or more deployment configs"

 os::cmd::expect_failure_and_text "oc set deployment-hook ${arg}" "error: you must specify one of --pre, --mid, or --post"

 os::cmd::expect_success_and_text "oc set deployment-hook ${arg} --pre  -o yaml -- echo 'hello world'" 'pre:'

@@ -156,7 +156,7 @@ os::cmd::expect_success_and_text "oc set deployment-hook ${arg} --pre --containe

 os::cmd::expect_success_and_not_text "oc set deployment-hook ${arg} --pre --volumes=vol1 -o yaml -- echo 'hello world'" 'does not have a volume named'

 os::cmd::expect_success_and_text "oc set deployment-hook ${arg} --pre --volumes=vol1 -o yaml -- echo 'hello world'" '\- vol1'

 # Server object tests

-os::cmd::expect_success "oc create -f test/integration/fixtures/test-deployment-config.yaml"

+os::cmd::expect_success "oc create -f test/integration/testdata/test-deployment-config.yaml"

 os::cmd::expect_failure_and_text "oc set deployment-hook dc/test-deployment-config --pre" "you must specify a command"

 os::cmd::expect_success_and_text "oc set deployment-hook test-deployment-config --pre -- echo 'hello world'" "updated"

 os::cmd::expect_success_and_text "oc set deployment-hook dc/test-deployment-config --pre -- echo 'hello world'" "was not changed"

@@ -27,14 +27,14 @@ os::test::junit::declare_suite_start "cmd/images"

 os::test::junit::declare_suite_start "cmd/images/images"

 os::cmd::expect_success 'oc get images'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-image.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-image.json'

 os::cmd::expect_success 'oc delete images test'

 echo "images: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/images/imagestreams"

 os::cmd::expect_success 'oc get imageStreams'

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-image-stream.json'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-image-stream.json'

 # verify that creating a registry fills out .status.dockerImageRepository

 if os::cmd::expect_success_and_not_text "oc get imageStreams test --template='{{.status.dockerImageRepository}}'" '.'; then

   # create the registry

@@ -191,7 +191,7 @@ os::cmd::expect_success_and_text 'oc tag mysql:latest tagtest:new1 --alias' 'Tag

 os::cmd::expect_success_and_text 'oc tag mysql:latest tagtest:new1' 'Tag tagtest:new1 set to mysql@sha256:'

 # test deleting a spec tag using oc tag

-os::cmd::expect_success 'oc create -f test/fixtures/test-stream.yaml'

+os::cmd::expect_success 'oc create -f test/testdata/test-stream.yaml'

 os::cmd::expect_success_and_text 'oc tag test-stream:latest -d' 'Deleted'

 os::cmd::expect_success 'oc delete is/test-stream'

 echo "tag: ok"

@@ -68,8 +68,8 @@ os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample --param MYSQ

 # verify we can create from a template when some objects in the template declare an app label

 # the app label should still be applied to the other objects in the template.

-os::cmd::expect_success_and_text 'oc new-app -f test/fixtures/template-with-app-label.json -o yaml' 'app: ruby-sample-build'

-os::cmd::expect_success_and_text 'oc new-app -f test/fixtures/template-with-app-label.json -o yaml' 'app: myapp'

+os::cmd::expect_success_and_text 'oc new-app -f test/testdata/template-with-app-label.json -o yaml' 'app: ruby-sample-build'

+os::cmd::expect_success_and_text 'oc new-app -f test/testdata/template-with-app-label.json -o yaml' 'app: myapp'

 # check search

 os::cmd::expect_success_and_text 'oc new-app --search mysql' "Tags:\s+5.5, 5.6, latest"

@@ -196,19 +196,19 @@ os::cmd::expect_success_and_text 'oc new-app mysql --name=db' 'db'

 os::cmd::expect_success 'oc new-app https://github.com/openshift/ruby-hello-world -l app=ruby'

 os::cmd::expect_success 'oc delete all -l app=ruby'

 # check for error when template JSON file has errors

-jsonfile="${OS_ROOT}/test/fixtures/invalid.json"

+jsonfile="${OS_ROOT}/test/testdata/invalid.json"

 os::cmd::expect_failure_and_text "oc new-app '${jsonfile}'" "error: unable to load template file \"${jsonfile}\": at offset 8: invalid character '}' after object key"

 # a docker compose file should be transformed into an application by the import command

-os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml --dry-run' 'warning: not all docker-compose fields were honored'

-os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml --dry-run' 'db: cpuset is not supported'

-os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml --dry-run' 'no-ports: no ports defined to send traffic to - no OpenShift service was created'

-os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml -o name --dry-run' 'service/redis'

-os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml -o name --as-template=other --dry-run' 'template/other'

-os::cmd::expect_success '[[ $(diff --suppress-common-lines -y <(oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/complex/docker-compose.yml -o yaml) test/fixtures/app-scenarios/docker-compose/complex/docker-compose.imported.yaml | grep -vE "ref\:|secret|uri\:" | wc -l) -eq 0 ]]'

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/testdata/app-scenarios/docker-compose/complex/docker-compose.yml --dry-run' 'warning: not all docker-compose fields were honored'

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/testdata/app-scenarios/docker-compose/complex/docker-compose.yml --dry-run' 'db: cpuset is not supported'

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/testdata/app-scenarios/docker-compose/complex/docker-compose.yml --dry-run' 'no-ports: no ports defined to send traffic to - no OpenShift service was created'

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/testdata/app-scenarios/docker-compose/complex/docker-compose.yml -o name --dry-run' 'service/redis'

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/testdata/app-scenarios/docker-compose/complex/docker-compose.yml -o name --as-template=other --dry-run' 'template/other'

+os::cmd::expect_success '[[ $(diff --suppress-common-lines -y <(oc import docker-compose -f test/testdata/app-scenarios/docker-compose/complex/docker-compose.yml -o yaml) test/testdata/app-scenarios/docker-compose/complex/docker-compose.imported.yaml | grep -vE "ref\:|secret|uri\:" | wc -l) -eq 0 ]]'

 # verify a docker-compose.yml schema 2 resource can be transformed, and that it sets env vars correctly.

-os::cmd::expect_success_and_text 'oc import docker-compose -f test/fixtures/app-scenarios/docker-compose/wordpress/docker-compose.yml -o yaml --as-template=other --dry-run' 'value: wordpress'

+os::cmd::expect_success_and_text 'oc import docker-compose -f test/testdata/app-scenarios/docker-compose/wordpress/docker-compose.yml -o yaml --as-template=other --dry-run' 'value: wordpress'

 # check new-build

 os::cmd::expect_failure_and_text 'oc new-build mysql -o yaml' 'you must specify at least one source repository URL'

@@ -224,7 +224,7 @@ os::cmd::expect_failure_and_text 'oc new-app  openshift/bogusImage https://githu

 # allow use of non-existent image (should succeed)

 os::cmd::expect_success 'oc new-app openshift/bogusImage https://github.com/openshift/ruby-hello-world.git -o yaml --allow-missing-images'

-os::cmd::expect_success 'oc create -f test/fixtures/installable-stream.yaml'

+os::cmd::expect_success 'oc create -f test/testdata/installable-stream.yaml'

 project=$(oc project -q)

 os::cmd::expect_success 'oc policy add-role-to-user edit test-user'

@@ -92,7 +92,7 @@ os::cmd::expect_failure 'oc policy can-i create pods --as harold -q'

 # adjust the cluster-admin role to check defaulting and coverage checks

 # this is done here instead of an integration test because we need to make sure the actual yaml serializations work

 workingdir=$(mktemp -d)

-cp ${OS_ROOT}/test/fixtures/bootstrappolicy/cluster_admin_1.0.yaml ${workingdir}

+cp ${OS_ROOT}/test/testdata/bootstrappolicy/cluster_admin_1.0.yaml ${workingdir}

 os::util::sed "s/RESOURCE_VERSION//g" ${workingdir}/cluster_admin_1.0.yaml

 os::cmd::expect_success "oc create -f ${workingdir}/cluster_admin_1.0.yaml"

 os::cmd::expect_success 'oadm policy add-cluster-role-to-user alternate-cluster-admin alternate-cluster-admin-user'

@@ -105,21 +105,21 @@ os::cmd::expect_success "oc login -u alternate-cluster-admin-user -p anything --

 # alternate-cluster-admin should default to having star rights, so he should be able to update his role to that

 os::cmd::try_until_text "oc policy who-can update clusterrroles" "alternate-cluster-admin-user"

 resourceversion=$(oc get clusterrole/alternate-cluster-admin -o=jsonpath="{.metadata.resourceVersion}")

-cp ${OS_ROOT}/test/fixtures/bootstrappolicy/alternate_cluster_admin.yaml ${workingdir}

+cp ${OS_ROOT}/test/testdata/bootstrappolicy/alternate_cluster_admin.yaml ${workingdir}

 os::util::sed "s/RESOURCE_VERSION/${resourceversion}/g" ${workingdir}/alternate_cluster_admin.yaml

 os::cmd::expect_success "oc replace --config=${new_kubeconfig} clusterrole/alternate-cluster-admin -f ${workingdir}/alternate_cluster_admin.yaml"

 # alternate-cluster-admin can restrict himself to no groups

 os::cmd::try_until_text "oc policy who-can update clusterrroles" "alternate-cluster-admin-user"

 resourceversion=$(oc get clusterrole/alternate-cluster-admin -o=jsonpath="{.metadata.resourceVersion}")

-cp ${OS_ROOT}/test/fixtures/bootstrappolicy/cluster_admin_without_apigroups.yaml ${workingdir}

+cp ${OS_ROOT}/test/testdata/bootstrappolicy/cluster_admin_without_apigroups.yaml ${workingdir}

 os::util::sed "s/RESOURCE_VERSION/${resourceversion}/g" ${workingdir}/cluster_admin_without_apigroups.yaml

 os::cmd::expect_success "oc replace --config=${new_kubeconfig} clusterrole/alternate-cluster-admin -f ${workingdir}/cluster_admin_without_apigroups.yaml"

 # alternate-cluster-admin should NOT have the power add back star now

 os::cmd::try_until_failure "oc policy who-can update hpa.extensions | grep -q alternate-cluster-admin-user"

 resourceversion=$(oc get clusterrole/alternate-cluster-admin -o=jsonpath="{.metadata.resourceVersion}")

-cp ${OS_ROOT}/test/fixtures/bootstrappolicy/alternate_cluster_admin.yaml ${workingdir}

+cp ${OS_ROOT}/test/testdata/bootstrappolicy/alternate_cluster_admin.yaml ${workingdir}

 os::util::sed "s/RESOURCE_VERSION/${resourceversion}/g" ${workingdir}/alternate_cluster_admin.yaml

 os::cmd::expect_failure_and_text "oc replace --config=${new_kubeconfig} clusterrole/alternate-cluster-admin -f ${workingdir}/alternate_cluster_admin.yaml" "cannot grant extra privileges"

@@ -43,10 +43,10 @@ os::cmd::expect_failure_and_text 'oc process template-name --value=key=value --v

 os::cmd::expect_failure_and_text 'oc process template-name key=value --value=key=value' 'provided more than once: key'

 os::cmd::expect_failure_and_text 'oc process template-name key=value other=foo --value=key=value --value=other=baz' 'provided more than once: key, other'

-required_params="${OS_ROOT}/test/fixtures/template_required_params.yaml"

+required_params="${OS_ROOT}/test/testdata/template_required_params.yaml"

 # providing something other than a template is not OK

-os::cmd::expect_failure_and_text "oc process -f '${OS_ROOT}/test/fixtures/basic-users-binding.json'" 'not a valid Template but'

+os::cmd::expect_failure_and_text "oc process -f '${OS_ROOT}/test/testdata/basic-users-binding.json'" 'not a valid Template but'

 # not providing required parameter should fail

 os::cmd::expect_failure_and_text "oc process -f '${required_params}'" 'parameter required_param is required and must be specified'

@@ -40,21 +40,21 @@ echo "templates: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/templates/config"

-os::cmd::expect_success 'oc process -f test/templates/fixtures/guestbook.json -l app=guestbook | oc create -f -'

+os::cmd::expect_success 'oc process -f test/templates/testdata/guestbook.json -l app=guestbook | oc create -f -'

 os::cmd::expect_success_and_text 'oc status' 'frontend-service'

 echo "template+config: ok"

 os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/templates/parameters"

 # Joined parameter values are honored

-os::cmd::expect_success_and_text 'oc process -f test/templates/fixtures/guestbook.json -v ADMIN_USERNAME=myuser,ADMIN_PASSWORD=mypassword'    '"myuser"'

-os::cmd::expect_success_and_text 'oc process -f test/templates/fixtures/guestbook.json -v ADMIN_USERNAME=myuser,ADMIN_PASSWORD=mypassword'    '"mypassword"'

+os::cmd::expect_success_and_text 'oc process -f test/templates/testdata/guestbook.json -v ADMIN_USERNAME=myuser,ADMIN_PASSWORD=mypassword'    '"myuser"'

+os::cmd::expect_success_and_text 'oc process -f test/templates/testdata/guestbook.json -v ADMIN_USERNAME=myuser,ADMIN_PASSWORD=mypassword'    '"mypassword"'

 # Individually specified parameter values are honored

-os::cmd::expect_success_and_text 'oc process -f test/templates/fixtures/guestbook.json -v ADMIN_USERNAME=myuser -v ADMIN_PASSWORD=mypassword' '"myuser"'

-os::cmd::expect_success_and_text 'oc process -f test/templates/fixtures/guestbook.json -v ADMIN_USERNAME=myuser -v ADMIN_PASSWORD=mypassword' '"mypassword"'

+os::cmd::expect_success_and_text 'oc process -f test/templates/testdata/guestbook.json -v ADMIN_USERNAME=myuser -v ADMIN_PASSWORD=mypassword' '"myuser"'

+os::cmd::expect_success_and_text 'oc process -f test/templates/testdata/guestbook.json -v ADMIN_USERNAME=myuser -v ADMIN_PASSWORD=mypassword' '"mypassword"'

 # Argument values are honored

-os::cmd::expect_success_and_text 'oc process ADMIN_USERNAME=myuser ADMIN_PASSWORD=mypassword -f test/templates/fixtures/guestbook.json'       '"myuser"'

-os::cmd::expect_success_and_text 'oc process -f test/templates/fixtures/guestbook.json ADMIN_USERNAME=myuser ADMIN_PASSWORD=mypassword'       '"mypassword"'

+os::cmd::expect_success_and_text 'oc process ADMIN_USERNAME=myuser ADMIN_PASSWORD=mypassword -f test/templates/testdata/guestbook.json'       '"myuser"'

+os::cmd::expect_success_and_text 'oc process -f test/templates/testdata/guestbook.json ADMIN_USERNAME=myuser ADMIN_PASSWORD=mypassword'       '"mypassword"'

 # Argument values with commas are honored

 os::cmd::expect_success 'oc create -f examples/sample-app/application-template-stibuild.json'

 os::cmd::expect_success_and_text 'oc process ruby-helloworld-sample MYSQL_USER=myself MYSQL_PASSWORD=my,1%pass'  '"myself"'

@@ -66,7 +66,7 @@ os::test::junit::declare_suite_end

 os::test::junit::declare_suite_start "cmd/templates/data-precision"

 # Run as cluster-admin to allow choosing any supplemental groups we want

 # Ensure large integers survive unstructured JSON creation

-os::cmd::expect_success 'oc create -f test/fixtures/template-type-precision.json'

+os::cmd::expect_success 'oc create -f test/testdata/template-type-precision.json'

 # ... and processing

 os::cmd::expect_success_and_text 'oc process template-type-precision' '1000030003'

 os::cmd::expect_success_and_text 'oc process template-type-precision' '2147483647'

@@ -22,7 +22,7 @@ trap os::test::junit::reconcile_output EXIT

 os::test::junit::declare_suite_start "cmd/volumes"

 # This test validates the 'volume' command

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

 os::cmd::expect_success_and_text 'oc volume dc/test-deployment-config --list' 'vol1'

 os::cmd::expect_success 'oc volume dc/test-deployment-config --add --name=vol0 -m /opt5'

@@ -192,12 +192,12 @@ os::cmd::expect_success_and_text "cat '${LOG_DIR}/kubectl-with-token.log'" 'kube

 echo "[INFO] Testing deployment logs and failing pre and mid hooks ..."

 # test hook selectors

-os::cmd::expect_success "oc create -f ${OS_ROOT}/test/fixtures/complete-dc-hooks.yaml"

+os::cmd::expect_success "oc create -f ${OS_ROOT}/test/testdata/complete-dc-hooks.yaml"

 os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-pre  -o jsonpath={.items[*].status.phase}' '^Succeeded$'

 os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-mid  -o jsonpath={.items[*].status.phase}' '^Succeeded$'

 os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-post -o jsonpath={.items[*].status.phase}' '^Succeeded$'

 # test the pre hook on a rolling deployment

-oc create -f test/fixtures/failing-dc.yaml

+oc create -f test/testdata/failing-dc.yaml

 tryuntil oc get rc/failing-dc-1

 oc logs -f dc/failing-dc

 wait_for_command "oc get rc/failing-dc-1 --template={{.metadata.annotations}} | grep openshift.io/deployment.phase:Failed" $((60*TIME_SEC))

@@ -210,7 +210,7 @@ os::cmd::expect_success_and_text 'oc logs --previous --since-time=2000-01-01T12:

 os::cmd::expect_success_and_text 'oc logs --previous --since-time=2000-01-01T12:34:56Z --loglevel=6 dc/failing-dc 2>&1' 'test pre hook executed'

 oc delete dc/failing-dc

 # test the mid hook on a recreate deployment and the health check

-oc create -f test/fixtures/failing-dc-mid.yaml

+oc create -f test/testdata/failing-dc-mid.yaml

 tryuntil oc get rc/failing-dc-mid-1

 oc logs -f dc/failing-dc-mid

 wait_for_command "oc get rc/failing-dc-mid-1 --template={{.metadata.annotations}} | grep openshift.io/deployment.phase:Failed" $((60*TIME_SEC))

@@ -252,7 +252,7 @@ os::cmd::expect_success 'oc logs buildconfig/ruby-sample-build --loglevel=6'

 echo "logs: ok"

 echo "[INFO] Starting a deployment to test scaling and image tag..."

-os::cmd::expect_success 'oc create -f test/integration/fixtures/test-deployment-config.yaml'

+os::cmd::expect_success 'oc create -f test/integration/testdata/test-deployment-config.yaml'

 # scaling which might conflict with the deployment should work

 os::cmd::expect_success 'oc scale dc/test-deployment-config --replicas=2'

 os::cmd::try_until_text 'oc get rc/test-deployment-config-1 -o yaml' 'Complete'

@@ -341,7 +341,7 @@ echo "[INFO] Validating pod.spec.nodeSelector rejections"

 # Create a project that enforces an impossible to satisfy nodeSelector, and two pods, one of which has an explicit node name

 os::cmd::expect_success "openshift admin new-project node-selector --description='This is an example project to test node selection prevents deployment' --admin='e2e-user' --node-selector='impossible-label=true'"

 NODE_NAME=`oc get node --no-headers | awk '{print $1}'`

-os::cmd::expect_success "oc process -n node-selector -v NODE_NAME='${NODE_NAME}' -f test/fixtures/node-selector/pods.json | oc create -n node-selector -f -"

+os::cmd::expect_success "oc process -n node-selector -v NODE_NAME='${NODE_NAME}' -f test/testdata/node-selector/pods.json | oc create -n node-selector -f -"

 # The pod without a node name should fail to schedule

 os::cmd::try_until_text 'oc get events -n node-selector' 'pod-without-node-name.+FailedScheduling' $((20*TIME_SEC))

 # The pod with a node name should be rejected by the kubelet

@@ -120,7 +120,7 @@ var _ = g.Describe("[<test bucket>] <Testing scenario>", func() {

 	defer g.GinkgoRecover()

 	var (