| Chunk |
|---|
| Conflicting content |
|---|
assert_productList(exec_result, Arrays.asList(prod1, prod2), Arrays.asList(prod3));
}
<<<<<<< HEAD
@Test(description="list the products by environment", groups = {"cli-products"}, enabled=false) //TODO - gkhachik via content views
=======
//@ TODO 961780 repo list should be changed to accept option --content_view
@Test(description="list the products by environment", groups = {"cli-products"}, enabled=true)
>>>>>>> 87e495d5fec9ae6cdfc1ab5ce545fb129dce5b78
public void test_listProduct_environment() {
String prodName1 = "prod1-"+KatelloUtils.getUniqueID();
String prodName2 = "prod2-"+KatelloUtils.getUniqueID(); |
| Solution content |
|---|
assert_productList(exec_result, Arrays.asList(prod1, prod2), Arrays.asList(prod3));
}
<<<<<<< HEAD
@Test(description="list the products by environment", groups = {"cli-products"}, enabled=false) //TODO - gkhachik via content views
=======
//@ TODO 961780 repo list should be changed to accept option --content_view
@Test(description="list the products by environment", groups = {"cli-products"}, enabled=true)
>>>>>>> 87e495d5fec9ae6cdfc1ab5ce545fb129dce5b78
public void test_listProduct_environment() {
String prodName1 = "prod1-"+KatelloUtils.getUniqueID();
String prodName2 = "prod2-"+KatelloUtils.getUniqueID(); |
| File |
|---|
| ProductTests.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
Assert.assertFalse(getOutput(res).matches(match_info),"Repo list of the product - should not contain package count 0 (after product synchronize)");
}
<<<<<<< HEAD
@Test(description="delete product - included in some changeset", groups = {"cli-products"}, enabled=false) // TODO - gkhachik via content views
=======
//@ TODO 961780 repo list should be changed to accept option --content_view
@Test(description="delete product - included in some changeset", groups = {"cli-products"}, enabled=true)
>>>>>>> 87e495d5fec9ae6cdfc1ab5ce545fb129dce5b78
public void test_deleteProduct_InChangeset(){
String uid = KatelloUtils.getUniqueID();
String prodName = "delProd1-"+uid; |
| Solution content |
|---|
Assert.assertFalse(getOutput(res).matches(match_info),"Repo list of the product - should not contain package count 0 (after product synchronize)");
}
<<<<<<< HEAD
@Test(description="delete product - included in some changeset", groups = {"cli-products"}, enabled=false) // TODO - gkhachik via content views
=======
//@ TODO 961780 repo list should be changed to accept option --content_view
@Test(description="delete product - included in some changeset", groups = {"cli-products"}, enabled=true)
>>>>>>> 87e495d5fec9ae6cdfc1ab5ce545fb129dce5b78
public void test_deleteProduct_InChangeset(){
String uid = KatelloUtils.getUniqueID();
String prodName = "delProd1-"+uid; |
| File |
|---|
| ProductTests.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Comment |