Fix test and reorder initialization of groups

Delete a job scale test A subsequent PR is going to remove support for this anyways. Initialize extensions before batch and autoscaling per @lavalamp review suggestion.

Fix test and reorder initialization of groups
3433d50b · Eric Tune · 175addf2 · 3433d50b · 3433d50b
Commit 3433d50b authored Feb 18, 2016 by Eric Tune
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 11 deletions

test-cmd.sh hack/test-cmd.sh +1 -5

testapi.go pkg/api/testapi/testapi.go +6 -6

No files found.
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -242,7 +242,6 @@ runTests() {
  hpa_min_field=".spec.minReplicas"
  hpa_max_field=".spec.maxReplicas"
  hpa_cpu_field=".spec.cpuUtilization.targetPercentage"
-  job_parallelism_field=".spec.parallelism"
  deployment_replicas=".spec.replicas"
  secret_data=".data"
  secret_type=".type"
@@ -1048,10 +1047,7 @@ __EOF__
  ### Scale a job
  kubectl create -f docs/user-guide/job.yaml "${kube_flags[@]}"
-  # Command
+  # Job scale support removed.
-  kubectl scale --replicas=2 job/pi
-  # Post-condition: 2 replicas for pi
-  kube::test::get_object_assert 'job pi' "{{$job_parallelism_field}}" '2'
  # Clean-up
  kubectl delete job/pi "${kube_flags[@]}"

--- a/pkg/api/testapi/testapi.go
+++ b/pkg/api/testapi/testapi.go
@@ -75,6 +75,12 @@ func init() {
 			internalGroupVersion: api.SchemeGroupVersion,
 		}
 	}
+	if _, ok := Groups[extensions.GroupName]; !ok {
+		Groups[extensions.GroupName] = TestGroup{
+			externalGroupVersion: unversioned.GroupVersion{Group: extensions.GroupName, Version: registered.GroupOrDie(extensions.GroupName).GroupVersion.Version},
+			internalGroupVersion: extensions.SchemeGroupVersion,
+		}
+	}
 	if _, ok := Groups[autoscaling.GroupName]; !ok {
 		Groups[autoscaling.GroupName] = TestGroup{
 			externalGroupVersion: unversioned.GroupVersion{Group: autoscaling.GroupName, Version: registered.GroupOrDie(autoscaling.GroupName).GroupVersion.Version},
@@ -87,12 +93,6 @@ func init() {
 			internalGroupVersion: extensions.SchemeGroupVersion,
 		}
 	}
-	if _, ok := Groups[extensions.GroupName]; !ok {
-		Groups[extensions.GroupName] = TestGroup{
-			externalGroupVersion: unversioned.GroupVersion{Group: extensions.GroupName, Version: registered.GroupOrDie(extensions.GroupName).GroupVersion.Version},
-			internalGroupVersion: extensions.SchemeGroupVersion,
-		}
-	}
 	Default = Groups[api.GroupName]
 	Autoscaling = Groups[autoscaling.GroupName]