Add aws to some e2e tests

This commit is contained in:
Justin Santa Barbara 2015-01-29 09:52:18 -05:00
parent 2f195578cc
commit 993071dd64
2 changed files with 3 additions and 3 deletions

View File

@ -32,7 +32,7 @@ import (
// TestKubeletSendsEvent checks that kubelets and scheduler send events about pods scheduling and running. // TestKubeletSendsEvent checks that kubelets and scheduler send events about pods scheduling and running.
func TestKubeletSendsEvent(c *client.Client) bool { func TestKubeletSendsEvent(c *client.Client) bool {
provider := testContext.provider provider := testContext.provider
if len(provider) > 0 && provider != "gce" && provider != "gke" { if len(provider) > 0 && provider != "gce" && provider != "gke" && provider != "aws" {
glog.Infof("skipping TestKubeletSendsEvent on cloud provider %s", provider) glog.Infof("skipping TestKubeletSendsEvent on cloud provider %s", provider)
return true return true
} }

View File

@ -29,8 +29,8 @@ import (
// with the TestBasicImage test. This test is only supported // with the TestBasicImage test. This test is only supported
// for the providers GCE and GKE. // for the providers GCE and GKE.
func TestPrivate(c *client.Client) bool { func TestPrivate(c *client.Client) bool {
if testContext.provider != "gce" && testContext.provider != "gke" { if testContext.provider != "gce" && testContext.provider != "gke" && testContext.provider != "aws" {
glog.Infof("Skipping test private which is only supported for providers gce and gke (not %s)", testContext.provider) glog.Infof("Skipping test private which is only supported for providers gce, gke and aws (not %s)", testContext.provider)
return true return true
} }
glog.Info("Calling out to TestBasic") glog.Info("Calling out to TestBasic")