Skip to content

Commit 482dc49

Browse files
authored
Merge pull request #182 from glennsarti/ticket/master/MODULES-3256-fix-login
(MODULES-3256)(MODULES-2323)(MODULES-2554)(MODULES-3083) Fix sqlserver::login resource
2 parents a76c302 + 102185b commit 482dc49

File tree

7 files changed

+446
-274
lines changed

7 files changed

+446
-274
lines changed

spec/acceptance/sqlserver_database_spec.rb

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ def run_sql_query_opts (query, expected_row_count)
2929
end
3030

3131
after(:each) do
32-
3332
# delete created database:
34-
3533
pp = <<-MANIFEST
3634
sqlserver::config{'MSSQLSERVER':
3735
admin_user => 'sa',
@@ -41,8 +39,7 @@ def run_sql_query_opts (query, expected_row_count)
4139
ensure => 'absent',
4240
}
4341
MANIFEST
44-
#comment out the below line because of ticket MODULES-2554.
45-
#ensure_sqlserver_database(host, pp)
42+
ensure_sqlserver_database(host, pp)
4643
end
4744

4845
it "Test Case C89019: Create a database" do
@@ -67,6 +64,37 @@ def run_sql_query_opts (query, expected_row_count)
6764
run_sql_query(host, run_sql_query_opts(query, 1))
6865
end
6966

67+
it "Delete a database" do
68+
pp = <<-MANIFEST
69+
sqlserver::config{'MSSQLSERVER':
70+
admin_user => 'sa',
71+
admin_pass => 'Pupp3t1@',
72+
}
73+
sqlserver::database{'#{@db_name}':
74+
}
75+
MANIFEST
76+
ensure_sqlserver_database(host, pp)
77+
78+
puts "Validate the Database '#{@db_name}' exists"
79+
query = "SELECT database_id from sys.databases WHERE name = '#{@db_name}';"
80+
run_sql_query(host, run_sql_query_opts(query, 1))
81+
82+
pp = <<-MANIFEST
83+
sqlserver::config{'MSSQLSERVER':
84+
admin_user => 'sa',
85+
admin_pass => 'Pupp3t1@',
86+
}
87+
sqlserver::database{'#{@db_name}':
88+
ensure => absent,
89+
}
90+
MANIFEST
91+
ensure_sqlserver_database(host, pp)
92+
93+
puts "Validate the Database '#{@db_name}' does not exist"
94+
query = "SELECT database_id from sys.databases WHERE name = '#{@db_name}';"
95+
run_sql_query(host, run_sql_query_opts(query, 0))
96+
end
97+
7098
it "Test Case C89076: Create database with optional collation_name" do
7199
pp = <<-MANIFEST
72100
sqlserver::config{'MSSQLSERVER':

0 commit comments

Comments
 (0)