Browse code
Deployment related refactors
Clayton Coleman authored on 2016/09/10 13:23:06Showing 1 changed files
| ... | ... |
@@ -8,7 +8,9 @@ import ( |
| 8 | 8 |
kapi "k8s.io/kubernetes/pkg/api" |
| 9 | 9 |
kerrors "k8s.io/kubernetes/pkg/api/errors" |
| 10 | 10 |
ktestclient "k8s.io/kubernetes/pkg/client/unversioned/testclient" |
| 11 |
+ "k8s.io/kubernetes/pkg/labels" |
|
| 11 | 12 |
"k8s.io/kubernetes/pkg/runtime" |
| 13 |
+ "k8s.io/kubernetes/pkg/util/diff" |
|
| 12 | 14 |
|
| 13 | 15 |
"github.com/openshift/origin/pkg/client/testclient" |
| 14 | 16 |
deployapi "github.com/openshift/origin/pkg/deploy/api" |
| ... | ... |
@@ -72,13 +74,12 @@ func TestStop(t *testing.T) {
|
| 72 | 72 |
ktestclient.NewDeleteAction("deploymentconfigs", "default", "config"),
|
| 73 | 73 |
}, |
| 74 | 74 |
kexpected: []ktestclient.Action{
|
| 75 |
- ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{}),
|
|
| 75 |
+ ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{LabelSelector: labels.SelectorFromSet(map[string]string{"openshift.io/deployment-config.name": "config"})}),
|
|
| 76 | 76 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 77 | 77 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 78 | 78 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 79 | 79 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 80 | 80 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 81 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
|
| 82 | 81 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-1"),
|
| 83 | 82 |
}, |
| 84 | 83 |
err: false, |
| ... | ... |
@@ -96,13 +97,12 @@ func TestStop(t *testing.T) {
|
| 96 | 96 |
ktestclient.NewDeleteAction("deploymentconfigs", "default", "config"),
|
| 97 | 97 |
}, |
| 98 | 98 |
kexpected: []ktestclient.Action{
|
| 99 |
- ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{}),
|
|
| 99 |
+ ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{LabelSelector: labels.SelectorFromSet(map[string]string{"openshift.io/deployment-config.name": "config"})}),
|
|
| 100 | 100 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 101 | 101 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 102 | 102 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 103 | 103 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 104 | 104 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 105 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
|
| 106 | 105 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-1"),
|
| 107 | 106 |
}, |
| 108 | 107 |
err: false, |
| ... | ... |
@@ -120,41 +120,36 @@ func TestStop(t *testing.T) {
|
| 120 | 120 |
ktestclient.NewDeleteAction("deploymentconfigs", "default", "config"),
|
| 121 | 121 |
}, |
| 122 | 122 |
kexpected: []ktestclient.Action{
|
| 123 |
- ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{}),
|
|
| 123 |
+ ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{LabelSelector: labels.SelectorFromSet(map[string]string{"openshift.io/deployment-config.name": "config"})}),
|
|
| 124 | 124 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 125 | 125 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 126 | 126 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 127 | 127 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 128 | 128 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 129 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
|
| 130 | 129 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-1"),
|
| 131 | 130 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-2"),
|
| 132 | 131 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 133 | 132 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-2"),
|
| 134 | 133 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 135 | 134 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-2"),
|
| 136 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 137 | 135 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-2"),
|
| 138 | 136 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-3"),
|
| 139 | 137 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 140 | 138 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-3"),
|
| 141 | 139 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 142 | 140 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-3"),
|
| 143 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 144 | 141 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-3"),
|
| 145 | 142 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
| 146 | 143 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 147 | 144 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
| 148 | 145 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 149 | 146 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
| 150 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 151 | 147 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-4"),
|
| 152 | 148 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
| 153 | 149 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 154 | 150 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
| 155 | 151 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 156 | 152 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
| 157 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 158 | 153 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-5"),
|
| 159 | 154 |
}, |
| 160 | 155 |
err: false, |
| ... | ... |
@@ -172,41 +167,36 @@ func TestStop(t *testing.T) {
|
| 172 | 172 |
ktestclient.NewDeleteAction("deploymentconfigs", "default", "config"),
|
| 173 | 173 |
}, |
| 174 | 174 |
kexpected: []ktestclient.Action{
|
| 175 |
- ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{}),
|
|
| 175 |
+ ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{LabelSelector: labels.SelectorFromSet(map[string]string{"openshift.io/deployment-config.name": "config"})}),
|
|
| 176 | 176 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 177 | 177 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 178 | 178 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 179 | 179 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 180 | 180 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 181 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
|
| 182 | 181 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-1"),
|
| 183 | 182 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-2"),
|
| 184 | 183 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 185 | 184 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-2"),
|
| 186 | 185 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 187 | 186 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-2"),
|
| 188 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 189 | 187 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-2"),
|
| 190 | 188 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-3"),
|
| 191 | 189 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 192 | 190 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-3"),
|
| 193 | 191 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 194 | 192 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-3"),
|
| 195 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 196 | 193 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-3"),
|
| 197 | 194 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
| 198 | 195 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 199 | 196 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
| 200 | 197 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 201 | 198 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-4"),
|
| 202 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 203 | 199 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-4"),
|
| 204 | 200 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
| 205 | 201 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 206 | 202 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
| 207 | 203 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 208 | 204 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
| 209 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-5"),
|
|
| 210 | 205 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-5"),
|
| 211 | 206 |
}, |
| 212 | 207 |
err: false, |
| ... | ... |
@@ -221,13 +211,12 @@ func TestStop(t *testing.T) {
|
| 221 | 221 |
ktestclient.NewGetAction("deploymentconfigs", "default", "config"),
|
| 222 | 222 |
}, |
| 223 | 223 |
kexpected: []ktestclient.Action{
|
| 224 |
- ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{}),
|
|
| 224 |
+ ktestclient.NewListAction("replicationcontrollers", "default", kapi.ListOptions{LabelSelector: labels.SelectorFromSet(map[string]string{"openshift.io/deployment-config.name": "config"})}),
|
|
| 225 | 225 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 226 | 226 |
ktestclient.NewListAction("replicationcontrollers", "", kapi.ListOptions{}),
|
| 227 | 227 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 228 | 228 |
ktestclient.NewUpdateAction("replicationcontrollers", "", nil),
|
| 229 | 229 |
ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
| 230 |
- ktestclient.NewGetAction("replicationcontrollers", "", "config-1"),
|
|
| 231 | 230 |
ktestclient.NewDeleteAction("replicationcontrollers", "", "config-1"),
|
| 232 | 231 |
}, |
| 233 | 232 |
err: false, |
| ... | ... |
@@ -293,7 +282,8 @@ func TestStop(t *testing.T) {
|
| 293 | 293 |
t.Errorf("%s: expected an error", test.testName)
|
| 294 | 294 |
} |
| 295 | 295 |
if len(test.oc.Actions()) != len(test.expected) {
|
| 296 |
- t.Fatalf("%s: unexpected actions: %v, expected %v", test.testName, test.oc.Actions(), test.expected)
|
|
| 296 |
+ t.Errorf("%s: unexpected actions: %s", test.testName, diff.ObjectReflectDiff(test.oc.Actions(), test.expected))
|
|
| 297 |
+ continue |
|
| 297 | 298 |
} |
| 298 | 299 |
for j, actualAction := range test.oc.Actions() {
|
| 299 | 300 |
e, a := test.expected[j], actualAction |
| ... | ... |
@@ -307,12 +297,13 @@ func TestStop(t *testing.T) {
|
| 307 | 307 |
} |
| 308 | 308 |
default: |
| 309 | 309 |
if !reflect.DeepEqual(actualAction, test.expected[j]) {
|
| 310 |
- t.Errorf("%s: unexpected action: got:\n%#+v\nexpected:\n%#+v", test.testName, actualAction, test.expected[j])
|
|
| 310 |
+ t.Errorf("%s: unexpected action: %s", test.testName, diff.ObjectReflectDiff(actualAction, test.expected[j]))
|
|
| 311 | 311 |
} |
| 312 | 312 |
} |
| 313 | 313 |
} |
| 314 | 314 |
if len(test.kc.Actions()) != len(test.kexpected) {
|
| 315 |
- t.Fatalf("%s: unexpected actions: %v, expected %v", test.testName, test.kc.Actions(), test.kexpected)
|
|
| 315 |
+ t.Errorf("%s: unexpected actions: %s", test.testName, diff.ObjectReflectDiff(test.kc.Actions(), test.kexpected))
|
|
| 316 |
+ continue |
|
| 316 | 317 |
} |
| 317 | 318 |
for j, actualAction := range test.kc.Actions() {
|
| 318 | 319 |
e, a := test.kexpected[j], actualAction |