github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-10 02:48:12 +00:00
Code Issues Projects Releases Wiki Activity

Collect "processes" to kill in openshiftCluster instead of named members

Browse Source 
We don’t really need to differentiate between the master/registry, we
just want to terminate them, maybe in the right order.  So, collect them
in an array instead of using separate members.

This will make it easier to have more registry instances in the near
future.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2017-04-29 03:04:42 +02:00
parent 44ee5be6db
commit c43e4cffaf
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
integration/openshift.go
View File

@ -22,8 +22,7 @@ var adminKUBECONFIG = map[string]string{
// running on localhost. // running on localhost.
type openshiftCluster struct { type openshiftCluster struct {
workingDir string workingDir string
master *exec.Cmd processes []*exec.Cmd // Processes to terminate on teardown; append to the end, terminate from end to the start.
registry *exec.Cmd
} }
// startOpenshiftCluster creates a new openshiftCluster. // startOpenshiftCluster creates a new openshiftCluster.
@ -59,13 +58,14 @@ func (cluster *openshiftCluster) clusterCmd(env map[string]string, name string,
// startMaster starts the OpenShift master (etcd+API server) and waits for it to be ready, or terminates on failure. // startMaster starts the OpenShift master (etcd+API server) and waits for it to be ready, or terminates on failure.
func (cluster *openshiftCluster) startMaster(c *check.C) { func (cluster *openshiftCluster) startMaster(c *check.C) {
cluster.master = cluster.clusterCmd(nil, "openshift", "start", "master") cmd := cluster.clusterCmd(nil, "openshift", "start", "master")
stdout, err := cluster.master.StdoutPipe() cluster.processes = append(cluster.processes, cmd)
stdout, err := cmd.StdoutPipe()
// Send both to the same pipe. This might cause the two streams to be mixed up, // Send both to the same pipe. This might cause the two streams to be mixed up,
// but logging actually goes only to stderr - this primarily ensure we log any // but logging actually goes only to stderr - this primarily ensure we log any
// unexpected output to stdout. // unexpected output to stdout.
cluster.master.Stderr = cluster.master.Stdout cmd.Stderr = cmd.Stdout
err = cluster.master.Start() err = cmd.Start()
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
portOpen, terminatePortCheck := newPortChecker(c, 8443) portOpen, terminatePortCheck := newPortChecker(c, 8443)
@ -172,7 +172,7 @@ func (cluster *openshiftCluster) startRegistryProcess(c *check.C, port int, conf
// startRegistry starts the OpenShift registry and waits for it to be ready, or terminates on failure. // startRegistry starts the OpenShift registry and waits for it to be ready, or terminates on failure.
func (cluster *openshiftCluster) startRegistry(c *check.C) { func (cluster *openshiftCluster) startRegistry(c *check.C) {
cluster.registry = cluster.startRegistryProcess(c, 5000, "/atomic-registry-config.yml") cluster.processes = append(cluster.processes, cluster.startRegistryProcess(c, 5000, "/atomic-registry-config.yml"))
} }
// ocLogin runs (oc login) and (oc new-project) on the cluster, or terminates on failure. // ocLogin runs (oc login) and (oc new-project) on the cluster, or terminates on failure.
@ -221,11 +221,8 @@ func (cluster *openshiftCluster) relaxImageSignerPermissions(c *check.C) {
// tearDown stops the cluster services and deletes (only some!) of the state. // tearDown stops the cluster services and deletes (only some!) of the state.
func (cluster *openshiftCluster) tearDown(c *check.C) { func (cluster *openshiftCluster) tearDown(c *check.C) {
if cluster.registry != nil && cluster.registry.Process != nil { for i := len(cluster.processes) - 1; i >= 0; i-- {
cluster.registry.Process.Kill() cluster.processes[i].Process.Kill()
}
if cluster.master != nil && cluster.master.Process != nil {
cluster.master.Process.Kill()
} }
if cluster.workingDir != "" { if cluster.workingDir != "" {
os.RemoveAll(cluster.workingDir) os.RemoveAll(cluster.workingDir)