@@ -50,7 +50,7 @@ func (suite *SubcommandTestSuite) TestUninstallManifestOnly() {
5050 os .WriteFile (path .Join (suite .tempdir , "found.toml" ), []byte (contents ), 0644 )
5151
5252 m := UninstallCmd {Driver : "found" , Level : config .ConfigEnv }.GetModel ()
53- suite .validateOutput ("Driver `found` uninstalled successfully!\r \n \r \n \r " , " " , suite .runCmd (m ))
53+ suite .validateOutput ("\r " , " Driver `found` uninstalled successfully!\n " , suite .runCmd (m ))
5454}
5555
5656func (suite * SubcommandTestSuite ) TestUninstallDriverAndManifest () {
@@ -71,7 +71,7 @@ func (suite *SubcommandTestSuite) TestUninstallDriverAndManifest() {
7171 os .WriteFile (path .Join (pkgdir , "some.dll" ), []byte ("anything" ), 0o644 )
7272
7373 m := UninstallCmd {Driver : "found" , Level : config .ConfigEnv }.GetModel ()
74- suite .validateOutput ("Driver `found` uninstalled successfully!\r \n \r \n \r " , " " , suite .runCmd (m ))
74+ suite .validateOutput ("\r " , " Driver `found` uninstalled successfully!\n " , suite .runCmd (m ))
7575}
7676
7777// Test what happens when a user installs a driver in multiple locations
@@ -159,7 +159,7 @@ func (suite *SubcommandTestSuite) TestUninstallManifestOnlyDriver() {
159159 // Now uninstall and verify we clean up
160160 m = UninstallCmd {Driver : "test-driver-manifest-only" , Level : suite .configLevel }.
161161 GetModelCustom (baseModel {getDriverRegistry : getTestDriverRegistry , downloadPkg : downloadTestPkg })
162- suite .validateOutput ("Driver `test-driver-manifest-only` uninstalled successfully!\r \n \r \n \r " , " " , suite .runCmd (m ))
162+ suite .validateOutput ("\r " , " Driver `test-driver-manifest-only` uninstalled successfully!\n " , suite .runCmd (m ))
163163 suite .driverIsNotInstalled ("test-driver-manifest-only" )
164164 suite .NoDirExists (filepath .Join (suite .Dir (), new_sidecar_path ))
165165}
@@ -199,7 +199,7 @@ func (suite *SubcommandTestSuite) TestUninstallInvalidManifest() {
199199 m = UninstallCmd {Driver : "test-driver-invalid-manifest" , Level : suite .configLevel }.GetModel ()
200200 output := suite .runCmd (m )
201201
202- suite .validateOutput ("Driver `test-driver-invalid-manifest` uninstalled successfully!\r \n \r \n \r " , " " , output )
202+ suite .validateOutput ("\r " , " Driver `test-driver-invalid-manifest` uninstalled successfully!\n " , output )
203203
204204 // Ensure we don't nuke the installation directory which is the original (major) issue
205205 suite .DirExists (suite .Dir ())
0 commit comments