@@ -105,9 +105,8 @@ func (t *TestCluster) ListNativeFunctions() []string {
105105 return t .NativeFuncs
106106}
107107
108- // DropLabeledFile places file from localPath to ~/ on every machine in
109- // cluster, potentially with a custom SELinux label.
110- func DropLabeledFile (machines []platform.Machine , localPath , selabel string ) error {
108+ // DropFile places file from localPath to ~/ on every machine in cluster
109+ func DropFile (machines []platform.Machine , localPath string ) error {
111110 in , err := os .Open (localPath )
112111 if err != nil {
113112 return err
@@ -125,23 +124,13 @@ func DropLabeledFile(machines []platform.Machine, localPath, selabel string) err
125124 if err := platform .InstallFile (in , m , partial ); err != nil {
126125 return err
127126 }
128- if selabel != "" {
129- if out , stderr , err := m .SSH (fmt .Sprintf ("sudo chcon -t %s %s.partial" , selabel , base )); err != nil {
130- return errors .Wrapf (err , "running chcon on %s.partial: %s: %s" , base , out , stderr )
131- }
132- }
133127 if out , stderr , err := m .SSH (fmt .Sprintf ("mv %[1]s.partial %[1]s" , base )); err != nil {
134128 return errors .Wrapf (err , "running mv %[1]s.partial %[1]s: %s: %s" , base , out , stderr )
135129 }
136130 }
137131 return nil
138132}
139133
140- // DropFile places file from localPath to ~/ on every machine in cluster
141- func DropFile (machines []platform.Machine , localPath string ) error {
142- return DropLabeledFile (machines , localPath , "" )
143- }
144-
145134// SSH runs a ssh command on the given machine in the cluster. It differs from
146135// Machine.SSH in that stderr is written to the test's output as a 'Log' line.
147136// This ensures the output will be correctly accumulated under the correct
0 commit comments