@@ -31,10 +31,11 @@ var bigquery = gcloud.bigquery();
3131var storage = gcloud . storage ( ) ;
3232
3333describe ( 'BigQuery' , function ( ) {
34- var DATASET_ID = 'testDatasetId' ;
34+ var DATASET_ID = ( 'gcloud_test_dataset_temp' + uuid . v1 ( ) ) . replace ( / - / g , '_' ) ;
3535 var dataset ;
3636 var TABLE_ID = 'myKittens' ;
3737 var table ;
38+ var BUCKET_NAME = 'gcloud-test-bucket-temp-' + uuid . v1 ( ) ;
3839 var bucket ;
3940
4041 var query = 'SELECT url FROM [publicdata:samples.github_nested] LIMIT 100' ;
@@ -86,8 +87,7 @@ describe('BigQuery', function() {
8687
8788 // Create a Bucket.
8889 function ( next ) {
89- var bucketName = 'gcloud-test-bucket-temp-' + uuid . v1 ( ) ;
90- storage . createBucket ( bucketName , function ( err , b ) {
90+ storage . createBucket ( BUCKET_NAME , function ( err , b ) {
9191 if ( err ) {
9292 next ( err ) ;
9393 return ;
@@ -100,6 +100,36 @@ describe('BigQuery', function() {
100100 ] , done ) ;
101101 } ) ;
102102
103+ after ( function ( done ) {
104+ async . parallel ( [
105+ // Delete the bucket we used.
106+ function ( next ) {
107+ bucket . getFiles ( function ( err , files ) {
108+ if ( err ) {
109+ next ( err ) ;
110+ return ;
111+ }
112+
113+ async . map ( files , function ( file , onComplete ) {
114+ file . delete ( onComplete ) ;
115+ } , function ( err ) {
116+ if ( err ) {
117+ next ( err ) ;
118+ return ;
119+ }
120+
121+ bucket . delete ( next ) ;
122+ } ) ;
123+ } ) ;
124+ } ,
125+
126+ // Delete the test dataset.
127+ function ( next ) {
128+ bigquery . dataset ( DATASET_ID ) . delete ( { force : true } , next ) ;
129+ }
130+ ] , done ) ;
131+ } ) ;
132+
103133 it ( 'should get a list of datasets' , function ( done ) {
104134 bigquery . getDatasets ( function ( err , datasets ) {
105135 assert ( datasets . length > 0 ) ;
0 commit comments