init add changes to split subscription and no subscription tests

grhuangmsft · grhuangmsft · commit d953d52648cb · 2024-03-07T16:58:49.000-05:00
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportChatTranscript.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportChatTranscript.Tests.ps1
@@ -17,7 +17,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportChatTranscript')
 # Chat functionality is unavailable for support tickets created outside the portal
 Describe 'Get-AzSupportChatTranscript' {
    
-    It 'List' {
+    It 'List' -Skip:!$env.HasSubscription{
         Mock Get-AzSupportChatTranscript{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.ChatTranscriptDetails"}
         Get-AzSupportChatTranscript -SupportTicketName $env.Name
         Assert-MockCalled Get-AzSupportChatTranscript -Exactly 1 
@@ -27,7 +27,7 @@ Describe 'Get-AzSupportChatTranscript' {
         { throw [System.NotImplementedException] } | Should -Not -Throw
     }
 
-    It 'Get'  {
+    It 'Get'  -Skip:!$env.HasSubscription{
         Mock Get-AzSupportChatTranscript{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.ChatTranscriptDetails"}
         Get-AzSupportChatTranscript -SupportTicketName $env.Name -Name "testChat"
         Assert-MockCalled Get-AzSupportChatTranscript -Exactly 2
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportChatTranscriptsNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportChatTranscriptsNoSubscription.Tests.ps1
@@ -16,12 +16,18 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportChatTranscriptsN
 
 # Chat functionality is unavailable for support tickets created outside the portal
 Describe 'Get-AzSupportChatTranscriptsNoSubscription' {
-    It 'Get' {
+    it 'List' -Skip:$env.HasSubscription {
         Mock Get-AzSupportChatTranscriptsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.ChatTranscriptDetails"}
-        Get-AzSupportChatTranscriptsNoSubscription -SupportTicketName $env.Name -ChatTranscriptName "testChat"
+        Get-AzSupportChatTranscriptsNoSubscription
         Assert-MockCalled Get-AzSupportChatTranscriptsNoSubscription -Exactly 1
     }
 
+    It 'Get' -Skip:$env.HasSubscription {
+        Mock Get-AzSupportChatTranscriptsNoSubscription{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.ChatTranscriptDetails"}
+        Get-AzSupportChatTranscriptsNoSubscription -SupportTicketName $env.Name -ChatTranscriptName "testChat"
+        Assert-MockCalled Get-AzSupportChatTranscriptsNoSubscription -Exactly 2
+    }
+
     It 'GetViaIdentitySupportTicket' -skip {
         { throw [System.NotImplementedException] } | Should -Not -Throw
     }
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportCommunication.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportCommunication.Tests.ps1
@@ -16,42 +16,42 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportCommunication'))
 
 Describe 'Get-AzSupportCommunication' {
 
-    It 'List' {
-        if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
-            write-host "cannot get communication operations for tickets with free support plan"
+    It 'List' -Skip:!$env.HasSubscription {
+        # if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
+        #     write-host "cannot get communication operations for tickets with free support plan"
             
-            Mock Get-AzSupportCommunication{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
+        #     Mock Get-AzSupportCommunication{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
             
-            Get-AzSupportCommunication -SupportTicketName $env.Name
+        #     Get-AzSupportCommunication -SupportTicketName $env.Name
             
-            Assert-MockCalled Get-AzSupportCommunication -Exactly 1 
-        }
-        else{
+        #     Assert-MockCalled Get-AzSupportCommunication -Exactly 1 
+        # }
+        # else{
             $supportMessage = Get-AzSupportCommunication -SupportTicketName $env.Name
         
             $supportMessage.Count | Should -BeGreaterThan 0
-        }
+        # }
     }
 
     It 'GetViaIdentitySupportTicket' -skip {
         { throw [System.NotImplementedException] } | Should -Not -Throw
     }
 
-    It 'Get' {
-        if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
-            write-host "cannot get communication operations for tickets with free support plan"
+    It 'Get' -Skip:!$env.HasSubscription {
+        # if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
+        #     write-host "cannot get communication operations for tickets with free support plan"
             
-            Mock Get-AzSupportCommunication{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
+        #     Mock Get-AzSupportCommunication{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
             
-            Get-AzSupportCommunication -SupportTicketName $env.Name -CommunicationName $env.CommunicationName
+        #     Get-AzSupportCommunication -SupportTicketName $env.Name -CommunicationName $env.CommunicationName
             
-            Assert-MockCalled Get-AzSupportCommunication -Exactly 2 
-        }
-        else{
+        #     Assert-MockCalled Get-AzSupportCommunication -Exactly 2 
+        # }
+        # else{
             $supportMessage = Get-AzSupportCommunication -CommunicationName $env.CommunicationName -SupportTicketName $env.Name
         
             $supportMessage.Body.ToString() | Should -Match $env.Body
-        }
+        # }
     } 
 
     It 'GetViaIdentity' -skip {
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportCommunicationsNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportCommunicationsNoSubscription.Tests.ps1
@@ -15,8 +15,12 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportCommunicationsNo
 }
 
 Describe 'Get-AzSupportCommunicationsNoSubscription' {
-
-    It 'Get' {
+    It 'List' -Skip:$env.HasSubscription {
+        $supportMessages = Get-AzSupportCommunicationsNoSubscription -SupportTicketName $env.Name
+        
+        $supportMessages.Count | Should -BeGreaterThan 0
+    }
+    It 'Get' -Skip:$env.HasSubscription {
         # if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
         #     write-host "cannot get communication operations for tickets with free support plan"
             
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportFile.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportFile.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportFile'))
 }
 
 Describe 'Get-AzSupportFile' {
-    It 'List' {
+    It 'List' -Skip:!$env.HasSubscription{
         $files = Get-AzSupportFile -WorkspaceName $env.FileWorkspaceNameSubscription
         $files | Should -Not -BeNullOrEmpty
         $files.Count | Should -BeGreaterOrEqual 1
@@ -25,7 +25,7 @@ Describe 'Get-AzSupportFile' {
         { throw [System.NotImplementedException] } | Should -Not -Throw
     }
 
-    It 'Get' {
+    It 'Get' -Skip:!$env.HasSubscription{
         $file = Get-AzSupportFile -Name "test2.txt" -WorkspaceName $env.FileWorkspaceNameSubscription
         $file | Should -Not -BeNullOrEmpty
         $file.Name | Should -Be "test2.txt"
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportFileWorkspace.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportFileWorkspace.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportFileWorkspace'))
 }
 
 Describe 'Get-AzSupportFileWorkspace' {
-    It 'Get' {
+    It 'Get' -Skip:!$env.HasSubscription{
         $fileWorkspace = Get-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription
         $fileWorkspace.Name | Should -Be $env.FileWorkspaceNameSubscription
     }
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportFileWorkspacesNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportFileWorkspacesNoSubscription.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportFileWorkspacesNo
 }
 
 Describe 'Get-AzSupportFileWorkspacesNoSubscription' {
-    It 'Get' {
+    It 'Get' -Skip:$env.HasSubscription{
         $fileWorkspace = Get-AzSupportFileWorkspacesNoSubscription -Name $env.FileWorkspaceNameNoSubscription
         $fileWorkspace.Name | Should -Be $env.FileWorkspaceNameNoSubscription
     }
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportFilesNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportFilesNoSubscription.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportFilesNoSubscript
 }
 
 Describe 'Get-AzSupportFilesNoSubscription' {
-    It 'List' {
+    It 'List' -Skip:$env.HasSubscription{
         $files = Get-AzSupportFilesNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription
         $files | Should -Not -BeNullOrEmpty
         $files.Count | Should -BeGreaterOrEqual 1
@@ -25,7 +25,7 @@ Describe 'Get-AzSupportFilesNoSubscription' {
         { throw [System.NotImplementedException] } | Should -Not -Throw
     }
 
-    It 'Get' {
+    It 'Get' -Skip:$env.HasSubscription{
         $file = Get-AzSupportFile -Name "test2.txt" -WorkspaceName $env.FileWorkspaceNameSubscription
         $file | Should -Not -BeNullOrEmpty
         $file.Name | Should -Be "test2.txt"
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportTicket.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportTicket.Tests.ps1
@@ -15,36 +15,36 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportTicket'))
 }
 
 Describe 'Get-AzSupportTicket' {
-    It 'List' {
-        if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
-            write-host "cannot get support tickets with free support plan"
+    It 'List' -Skip:!$env.HasSubscription{
+        # if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
+        #     write-host "cannot get support tickets with free support plan"
             
-            Mock Get-AzSupportTicket{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
+        #     Mock Get-AzSupportTicket{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
             
-            Get-AzSupportTicket
+        #     Get-AzSupportTicket
 
-            Assert-MockCalled Get-AzSupportTicket -Exactly 1
-        }
-        else{
+        #     Assert-MockCalled Get-AzSupportTicket -Exactly 1
+        # }
+        # else{
             $supportTickets = Get-AzSupportTicket 
             $supportTickets.Count | Should -BeGreaterThan 0
-        }
+        # }
     }
 
-    It 'Get' {
-        if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
-            write-host "cannot get support tickets with free support plan"
+    It 'Get' -Skip:!$env.HasSubscription{
+        # if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
+        #     write-host "cannot get support tickets with free support plan"
             
-            Mock Get-AzSupportTicket{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
+        #     Mock Get-AzSupportTicket{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.SupportTicketDetails"}
             
-            Get-AzSupportTicket -SupportTicketName $env.Name
+        #     Get-AzSupportTicket -SupportTicketName $env.Name
 
-            Assert-MockCalled Get-AzSupportTicket -Exactly 2
-        }
-        else{
+        #     Assert-MockCalled Get-AzSupportTicket -Exactly 2
+        # }
+        # else{
             $supportTicket = Get-AzSupportTicket -SupportTicketName $env.Name
             $supportTicket.Description | Should -Be "test ticket - please ignore and close"
-        }
+        # }
     }
 
     It 'GetViaIdentity' -skip {
diff --git a/src/Support/Support.Autorest/test/Get-AzSupportTicketsNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/Get-AzSupportTicketsNoSubscription.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportTicketsNoSubscri
 }
 
 Describe 'Get-AzSupportTicketsNoSubscription' {
-    It 'List'  {
+    It 'List'  -Skip:$env.HasSubscription{
         # if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
         #     write-host "cannot get support tickets with free support plan"
             
@@ -31,7 +31,7 @@ Describe 'Get-AzSupportTicketsNoSubscription' {
         # }
     }
 
-    It 'Get'  {
+    It 'Get'  -Skip:$env.HasSubscription{
     #     if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
     #         write-host "cannot get support tickets with free support plan"
             
diff --git a/src/Support/Support.Autorest/test/New-AzSupportCommunication.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportCommunication.Tests.ps1
@@ -15,20 +15,20 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportCommunication'))
 }
 
 Describe 'New-AzSupportCommunication' {
-    It 'CreateExpanded' {
-        if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
-            write-host "cannot create communication operations for tickets with free support plan"
+    It 'CreateExpanded' -Skip:!$env.HasSubscription{
+        # if($env.SupportPlanSubscription -eq "Basic support" || $env.SupportPlanSubscription -eq "Free"){
+        #     write-host "cannot create communication operations for tickets with free support plan"
             
-            Mock New-AzSupportCommunication{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
+        #     Mock New-AzSupportCommunication{ New-MockObject -Type "Microsoft.Azure.PowerShell.Cmdlets.Support.Models.CommunicationDetails"}
             
-            New-AzSupportCommunication -Name "test-msg-$(New-Guid)" -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
+        #     New-AzSupportCommunication -Name "test-msg-$(New-Guid)" -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
             
-            Assert-MockCalled New-AzSupportCommunication -Exactly 1
-        }
-        else{
-            $supportMessage = New-AzSupportCommunication -Name "test-msg-$(New-Guid)" -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
+        #     Assert-MockCalled New-AzSupportCommunication -Exactly 1
+        # }
+        # else{
+            $supportMessage = New-AzSupportCommunication -Name $env.communicationNameForCreate -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
         
             $supportMessage.Body.ToString() |  Should -Match $env.Body
-        }
+        # }
     }
 }
diff --git a/src/Support/Support.Autorest/test/New-AzSupportCommunicationsNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportCommunicationsNoSubscription.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportCommunicationsNo
 }
 
 Describe 'New-AzSupportCommunicationsNoSubscription' {
-    It 'CreateExpanded'  {
+    It 'CreateExpanded'  -Skip:$env.HasSubscription{
         # if($env.SupportPlanTenant -eq "Basic support" || $env.SupportPlanTenant -eq "Free"){
         #     write-host "cannot create communication operations for tickets with free support plan"
             
@@ -27,7 +27,7 @@ Describe 'New-AzSupportCommunicationsNoSubscription' {
         # }
         # else{
 
-            $supportMessage = New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName1 -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
+            $supportMessage = New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationNameForCreate -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
         
             $supportMessage.Body.ToString() |  Should -Match $env.Body
         # }
diff --git a/src/Support/Support.Autorest/test/New-AzSupportFileAndUpload.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportFileAndUpload.Tests.ps1
@@ -15,9 +15,9 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportFileAndUpload'))
 }
 
 Describe 'New-AzSupportFileAndUpload' {
-    It 'CreateExpanded' {
+    It 'CreateExpanded' -Skip:!$env.HasSubscription{
         $testFilePath = Join-Path $PSScriptRoot files test.txt
-        $file = New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
+        $file = New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath -SubscriptionId $env.SubscriptionId
         $file.Name | Should -Be "test.txt"
     }
 }
diff --git a/src/Support/Support.Autorest/test/New-AzSupportFileAndUploadNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportFileAndUploadNoSubscription.Tests.ps1
@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportFileAndUploadNoS
 }
 
 Describe 'New-AzSupportFileAndUploadNoSubscription' {
-    It 'CreateExpanded' {
+    It 'CreateExpanded' -Skip:$env.HasSubscription{
         $testFilePath = Join-Path $PSScriptRoot files test.txt
         $file = New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
         $file.Name | Should -Be "test.txt"
diff --git a/src/Support/Support.Autorest/test/New-AzSupportFileWorkspace.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportFileWorkspace.Tests.ps1
@@ -15,8 +15,8 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportFileWorkspace'))
 }
 
 Describe 'New-AzSupportFileWorkspace' {
-    It 'Create' {
-        $fileWorkspaceName = "test-ps-$(New-Guid)"
+    It 'Create' -Skip:!$env.HasSubscription{
+        $fileWorkspaceName = $env.FileWorkspaceNameSubscriptionForCreate
         $fileWorkspace = New-AzSupportFileWorkspace -Name $fileWorkspaceName -SubscriptionId $env.SubscriptionId
         $fileWorkspace.Name | Should -Be $fileWorkspaceName
     }
diff --git a/src/Support/Support.Autorest/test/New-AzSupportFileWorkspacesNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportFileWorkspacesNoSubscription.Tests.ps1
@@ -15,8 +15,8 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportFileWorkspacesNo
 }
 
 Describe 'New-AzSupportFileWorkspacesNoSubscription' {
-    It 'Create' {
-        $fileWorkspaceName = $env.fileWorkspaceNameNoSubscription2
+    It 'Create' -Skip:$env.HasSubscription{
+        $fileWorkspaceName = $env.fileWorkspaceNameNoSubscriptionForCreate
         $fileWorkspace = New-AzSupportFileWorkspacesNoSubscription -Name $fileWorkspaceName
         $fileWorkspace.Name | Should -Be $fileWorkspaceName
     }
diff --git a/src/Support/Support.Autorest/test/New-AzSupportTicket.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportTicket.Tests.ps1
@@ -14,8 +14,8 @@ if (($null -eq $TestName) -or ($TestName -contains 'New-AzSupportTicket')) {
 }
 
 Describe 'New-AzSupportTicket' {
-    It 'CreateExpanded' {
-        $supportTicket = New-AzSupportTicket -Name $env.Name1 -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
+    It 'CreateExpanded' -Skip:!$env.HasSubscription{
+        $supportTicket = New-AzSupportTicket -Name $env.NameForCreate -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
         
         $supportTicket.Description | Should -Be "test ticket - please ignore and close"
     }
diff --git a/src/Support/Support.Autorest/test/New-AzSupportTicketsNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/New-AzSupportTicketsNoSubscription.Tests.ps1
@@ -15,8 +15,8 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportTicketsNoSubscri
 }
 
 Describe 'New-AzSupportTicketsNoSubscription' {
-    It 'CreateExpanded' {
-        $supportTicket = New-AzSupportTicketsNoSubscription -SupportTicketName $env.Name1 -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
+    It 'CreateExpanded' -Skip:$env.HasSubscription{
+        $supportTicket = New-AzSupportTicketsNoSubscription -SupportTicketName $env.NameForCreate -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
         
         $supportTicket.Description | Should -Be "test ticket - please ignore and close"
     }
diff --git a/src/Support/Support.Autorest/test/Test-AzSupportCommunicationNameAvailability.Tests.ps1 b/src/Support/Support.Autorest/test/Test-AzSupportCommunicationNameAvailability.Tests.ps1
diff --git a/src/Support/Support.Autorest/test/Test-AzSupportCommunicationsNoSubscriptionNameAvailability.Tests.ps1 b/src/Support/Support.Autorest/test/Test-AzSupportCommunicationsNoSubscriptionNameAvailability.Tests.ps1
diff --git a/src/Support/Support.Autorest/test/Test-AzSupportTicketNameAvailability.Tests.ps1 b/src/Support/Support.Autorest/test/Test-AzSupportTicketNameAvailability.Tests.ps1
diff --git a/src/Support/Support.Autorest/test/Test-AzSupportTicketsNoSubscriptionNameAvailability.Tests.ps1 b/src/Support/Support.Autorest/test/Test-AzSupportTicketsNoSubscriptionNameAvailability.Tests.ps1
diff --git a/src/Support/Support.Autorest/test/Update-AzSupportTicket.Tests.ps1 b/src/Support/Support.Autorest/test/Update-AzSupportTicket.Tests.ps1
diff --git a/src/Support/Support.Autorest/test/Update-AzSupportTicketsNoSubscription.Tests.ps1 b/src/Support/Support.Autorest/test/Update-AzSupportTicketsNoSubscription.Tests.ps1
diff --git a/src/Support/Support.Autorest/test/utils.ps1 b/src/Support/Support.Autorest/test/utils.ps1

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'Get-AzSupportFileWorkspace'))`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`Describe 'Get-AzSupportFileWorkspace' {`
`18`		`- It 'Get' {`
	`18`	`+ It 'Get' -Skip:!$env.HasSubscription{`
`19`	`19`	`$fileWorkspace = Get-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription`
`20`	`20`	`$fileWorkspace.Name \| Should -Be $env.FileWorkspaceNameSubscription`
`21`	`21`	`}`