зеркало из https://github.com/Azure/acs-engine.git
E2E - enable focused tests (#3885)
This commit is contained in:
Родитель
6973e6de48
Коммит
fa3d6d44f8
|
@ -34,6 +34,7 @@ type Config struct {
|
|||
SoakClusterName string `envconfig:"SOAK_CLUSTER_NAME"`
|
||||
ForceDeploy bool `envconfig:"FORCE_DEPLOY"`
|
||||
UseDeployCommand bool `envconfig:"USE_DEPLOY_COMMAND"`
|
||||
GinkgoFocus string `envconfig:"GINKGO_FOCUS"`
|
||||
}
|
||||
|
||||
const (
|
||||
|
|
|
@ -215,8 +215,10 @@ func teardown() {
|
|||
log.Printf("cannot fetch openshift metrics: %v", err)
|
||||
}
|
||||
}
|
||||
if err := cliProvisioner.FetchActivityLog(acct, logsPath); err != nil {
|
||||
log.Printf("cannot fetch the activity log: %v", err)
|
||||
if !cfg.SkipLogsCollection {
|
||||
if err := cliProvisioner.FetchActivityLog(acct, logsPath); err != nil {
|
||||
log.Printf("cannot fetch the activity log: %v", err)
|
||||
}
|
||||
}
|
||||
if !cfg.RetainSSH {
|
||||
creds := filepath.Join(cfg.CurrentWorkingDir, "_output/", "*ssh*")
|
||||
|
|
|
@ -34,7 +34,12 @@ func BuildGinkgoRunner(cfg *config.Config, pt *metrics.Point) (*Ginkgo, error) {
|
|||
func (g *Ginkgo) Run() error {
|
||||
g.Point.SetTestStart()
|
||||
testDir := fmt.Sprintf("test/e2e/%s", g.Config.Orchestrator)
|
||||
cmd := exec.Command("ginkgo", "-slowSpecThreshold", "180", "-r", "-v", testDir)
|
||||
var cmd *exec.Cmd
|
||||
if g.Config.GinkgoFocus != "" {
|
||||
cmd = exec.Command("ginkgo", "-slowSpecThreshold", "180", "-r", "-v", "--focus", g.Config.GinkgoFocus, testDir)
|
||||
} else {
|
||||
cmd = exec.Command("ginkgo", "-slowSpecThreshold", "180", "-r", "-v", testDir)
|
||||
}
|
||||
util.PrintCommand(cmd)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
|
Загрузка…
Ссылка в новой задаче