accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Tue, 11 Mar 2014 04:32:07 GMT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fb17d458
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb17d458
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb17d458

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: fb17d4588d597e1124a47a4dd29dfc728bd1dc49
Parents: da7f937 6c05091
Author: Josh Elser <elserj@apache.org>
Authored: Tue Mar 11 00:26:39 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Mar 11 00:26:39 2014 -0400

----------------------------------------------------------------------
 test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb17d458/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
index 190f693,0000000..c116e30
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteRowsIT.java
@@@ -1,42 -1,0 +1,42 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test;
 +
 +import static org.junit.Assert.assertEquals;
 +
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.test.functional.FunctionalTestUtils;
 +import org.apache.accumulo.test.functional.SimpleMacIT;
 +import org.junit.Test;
 +
 +public class DeleteRowsIT extends SimpleMacIT {
 +  
-   @Test(timeout = 60 * 1000)
++  @Test(timeout = 5 * 60 * 1000)
 +  public void test() throws Exception {
 +    Connector c = getConnector();
 +    String[] tableNames = this.getTableNames(20);
 +    for (String tableName : tableNames) {
 +      c.tableOperations().create(tableName);
 +      c.tableOperations().deleteRows(tableName, null, null);
 +      Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
 +      assertEquals(0, FunctionalTestUtils.count(scanner));
 +    }
 +  }
 +
 +}


Mime
View raw message